Add (and use) KeyButMask enum.