normalize_paths()
This is a separate commit so it can be dropped during a rebase or revert independently.