am c2945850: Merge "Add some clarifying defines."

* commit 'c2945850e58f4ef50f3e3534ce50306262375d37':
  Add some clarifying defines.