Remove accidentally-inserted junk characters, general clean-up following static analysis