Yeah, not even going to fix it. All those date manipulations should be buried ASAP, but for the moment let's just shove them away in modules which still use them and clean up the public headers.