Convert credit card expiry values to integers

Fixes #4188