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

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