empty expiry_{year,month} results in bad attribute

[chadwhitacre]

If expiry_year or expiry_month is empty, then payment_method.expiry_year is '{"type": "integer"}'; the attribute is used instead of the (empty) content of the tag.