More consistently handling Date/DateTime/TimeOfDay formatting