Minor tweaks to Card and CardParser