Move BasicRoute stuff into HttpRequestContext
Misc. improvements to new routing subsystem