Port a half dozen passes or so to the new visitor

r? @brson