Some syntax cleaning and removal of unnecessary function wrappers in the time get routines.