Tweak use of date functions
Avoid unnecessary self-updates