Optimise Router#reverse more.