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

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