[Routing] Some tweaks

I think the new version has an improved readability. @fabpot random changes or what ?

At least I have spotted some bugs in the annotation loader that I will fix in the 2.0 branch.