Semicolon Fixers

Replaces #511.
File name and class name does not match!