Semicolon Fixers

Replaces #511.
No?