Issue #2234827: Add support for friendly names in visitor context keys as well as values