More changes to Route Compiler.