Cleanup double semicolons

Closes #1161