Fix issue with rounding years

The Date constructor will treat a single numeric arguments as
milliseconds from Unix Epoch, not years.
Additional code cleanup associated with PR