Revert "Fix #353.  Allow counts with mapped keys.  I'm hoping this fix
doesn't break something else."

This reverts commit cc8dd3c0f06fa7a05e480514ad34448d0ef0c9b9.