Restrict use of `Cmd` and `Opt` key names for Windows when defining key binding.
And include a couple of changes for other review feedback that I missed in previous commit.