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