am a05a04cc: Merge "Refactor transform-o-to-* definitions."

* commit 'a05a04cc754a6374c2ce6406dece9bbafa0abea0':
  Refactor transform-o-to-* definitions.