WIP refactoring to do two-ride MUNI trip.