Fix a regression: RouteMatcher did not match the 'remainder' of the variable routes. Also, some more optimalization: don't create extra groups when not necessary.