Bug 20287: Move fixup_cardnumber