Solve Issue 2233: Routing instructions disappearing too early in roundabouts.

Here is second attempt only with solution commit and without simplifications.