Revamped Variant system to use fewer calls.