am 2e47c8ac: am 1e1bae1b: am c2945850: Merge "Add some clarifying defines."

* commit '2e47c8ac74e070d62cfb46355c7c04797657c594':
  Add some clarifying defines.