Merge "Refactor transform-o-to-* definitions."