Fix comment issues based on pareview.sh report.
Merge branch '7.x-3.x' of git.drupal.org:sandbox/super_mario/2328781 into 7.x-3.x