am ad73e2f5: am ef023873: Merge "Minor style cleanup of some code I had to look at."

* commit 'ad73e2f58ca672ee8b7c19a1c993b829a43dd89c':
  Minor style cleanup of some code I had to look at.