Add simple modifiers support

Simple modifiers are those that were not intended to alter characters, so Control and Alt qualify.

WIP: Depends on !304 (merged)

WIP: Eliminate stateful locks from the history of this.

WIP: based on !330 (merged)