style: minor fixes, mostly as a followup to #665
Merge pull request #738 from pagespeed/jefftk-fix-style

style: minor fixes, mostly as a followup to #665