More travel path refactoring.