Improve Variant equality comparison