Add missing semicolons and remove a useless one

Also there are a bunch of lines where spaces _and_ tabs are used. We should settle on one of them. :)