Fix 'BButton 1' type issues by removing 'Button'

Sometimes the system will return 'Button 1' for controllers.
Then we add that to B to get BButton 1, which we don't want.
Ditch the Button part, if it's there.
Modifications to previous change.