Reduce dependence on transformed values.
Merge branch 'master' into gh-pages