Make sure journey JSON always includes waypoints

I don't like the idea of including a check for Journey in an otherwise generic function like this. Let's talk about this IRL.