Add more matching to key binding modifiers