Clean up Variant visitation