Untangles new token / route handling.