Semicolon Fixers

Replaces #511.
And again, why ?