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