This is super helpful, thanks!
I'm pushing out v1.10.3 now, which addresses both of the above (in the card_builder case I actually went a bit further and got rid of that file altogether).
I've also retagged v1.10.0 and included the patch you mention. Otherwise folks won't be able to migrate up from old versions.