Further simplifies positions.
Merge branch 'simplify-paths'