Merge change 948

* changes:
  Tweaks, Mostly grep-based, to better conform to the coding guidelines.