am 16e84cff: Minor clean up.

* commit '16e84cff3e53be8bd95b82a397b144d6a5266761':
  Minor clean up.