Major update to route matching.