More tweaks for token walking, lookup