squash: xbdatetime cleanups