Semicolon Fixers

Replaces #511.
I know....