Slight cleanup of T.extend_variant_one