Simplify expiry check in CreditCard

Fixes #3731