No functionality change. Adjust a bunch of formatting issues in this code and
fix a typo in a comment.