Fix internal helpers
Complete with_modifier_keys function