Issue #2227455 by katbailey: Support key/value separation in visitor contexts