Semicolon Fixers

Replaces #511.