Semicolon Fixers

Replaces #511.
But we need to be able to remove the spaces before we can take the new line characters out, so separating them is not possible.