Consolidate route aliases

Replaces some of the aliases patterns with consolidated branching
patterns and fixes some conditional matches in the patterns.