Merge pull request #744 from fabro-sh/codex/unify-reference-walkers