less-cryptic name
Remove commented-out code
Get the Control/Command/etc mask in a generic way.
Repair indentation; add debugging.
Move to old cruft holding package.
Tweak after move.