am 8779c4ea: Merge "Minor cleanups."

* commit '8779c4eab43956ecf626bbece3f6f3bc54970d6a':
  Minor cleanups.