Further cleanup of date/time expressions