Miscellaneous trivial cleanup.

Comment typos, duplicate require()'s, missing require(), missing
semicolon.