Fix a couple code-style issues in inline comments.
Address issues from the translation coder report.
Fix a variable name.
Merge pull request #316 from adam-vessey/7.x

Code standards in comments and translatability.