Do CreditCard attribute cleanup at assignment

The benefit of doing cleanup actively at assignment is that it does not
assume a specific lifecycle for the CreditCard.