More improvements to the variable routing.