Be more aggressive when updating trip groups

The previous approach only worked reliably if the algorithm stays
unchanged, now we are more robust to changes how we do the grouping.
Specifically, this now automatically cleans up leading appendices to
trips that previously have been wrongly added to a trip group.