Overhaul Variant visitors