oooh, I like fewer special cases...

(although there goes my automatic merge for the date-time stuff :( )