Semicolon Fixers

Replaces #511.
Will do asap.