Improve merging of bound and unbound train tickets

Combining an unbound ticket with a reservation (which is by definition
train-bound) is quite common, and we need to detect both referring to
the same trip.