Slightly better date handling.