[PATCH] Tidy up - remove use of (*f)() idiom from epoch.c