BUG: Fix irregular Timestamp arithmetic types #6543