Ss2 -- A bisection of account_cards with the slowdown issue

It's supposed to be just the simple stuff, renames, etc., but somehow I got a problem I'm looking for on the branch too.  Should make it easier to find.