Cosmetics for #1618: Does not need to_timestamp