diff --git a/include/aws/crt/Variant.h b/include/aws/crt/Variant.h
index ed2886eb0..ff4997851 100644
--- a/include/aws/crt/Variant.h
+++ b/include/aws/crt/Variant.h
@@ -83,7 +83,7 @@ namespace Aws
                     static const bool value = ContainsType<T, Ts...>();
                 };
             } // namespace Checker
-#if defined(DEBUG_BUILD)
+#if defined(AWS_CRT_ENABLE_VARIANT_DEBUG)
             namespace VariantDebug
             {
                 template <typename... Ts> class VariantDebugBrowser
@@ -93,7 +93,7 @@ namespace Aws
                     std::tuple<typename std::add_pointer<Ts>::type...> as_tuple;
 
                   private:
-                    template <short Index, typename First, typename Second, typename... Rest>
+                    template <IndexT Index, typename First, typename Second, typename... Rest>
                     void InitTuple(char *storage)
                     {
                         First *value = reinterpret_cast<First *>(storage);
@@ -101,14 +101,14 @@ namespace Aws
                         InitTuple<Index + 1, Second, Rest...>(storage);
                     }
 
-                    template <short Index, typename Last> void InitTuple(char *storage)
+                    template <IndexT Index, typename Last> void InitTuple(char *storage)
                     {
                         Last *value = reinterpret_cast<Last *>(storage);
                         std::get<Index>(as_tuple) = value;
                     }
                 };
             } // namespace VariantDebug
-#endif        /* defined(DEBUG_BUILD) */
+#endif        /* defined(AWS_CRT_ENABLE_VARIANT_DEBUG) */
         }     // namespace VariantDetail
 
         template <std::size_t Index, typename... Ts> class VariantAlternative;
@@ -124,20 +124,17 @@ namespace Aws
          */
         template <typename... Ts> class Variant
         {
-          public:
-            static constexpr std::size_t AlternativeCount = sizeof...(Ts);
-
+          private:
             template <std::size_t Index> using ThisVariantAlternative = VariantAlternative<Index, Ts...>;
 
-            using ThisVariantT = Variant<Ts...>;
-            template <typename OtherT>
-            using EnableIfOtherIsSameVariantType =
-                typename std::enable_if<std::is_same<typename std::decay<OtherT>, ThisVariantT>::value, int>::type;
-
             template <typename OtherT>
             using EnableIfOtherIsThisVariantAlternative = typename std::
                 enable_if<VariantDetail::Checker::HasType<typename std::decay<OtherT>::type, Ts...>::value, int>::type;
 
+          public:
+            using IndexT = VariantDetail::Index::VariantIndex;
+            static constexpr std::size_t AlternativeCount = sizeof...(Ts);
+
             Variant()
             {
                 using FirstAlternative = typename ThisVariantAlternative<0>::type;
@@ -147,19 +144,19 @@ namespace Aws
 
             Variant(const Variant &other)
             {
-                auto otherIdx = other.m_index;
-                if (otherIdx != -1)
+                m_index = other.m_index;
+                if (other.m_index != -1)
                 {
-                    CopyConstructUtil<0, Ts...>(other);
+                    VisitorUtil<0, Ts...>::VisitBinary(this, other, CopyMoveConstructor());
                 }
             }
 
             Variant(Variant &&other)
             {
-                auto otherIdx = other.m_index;
-                if (otherIdx != -1)
+                m_index = other.m_index;
+                if (other.m_index != -1)
                 {
-                    MoveConstructUtil<0, Ts...>(std::move(other));
+                    VisitorUtil<0, Ts...>::VisitBinary(this, other, CopyMoveConstructor());
                 }
             }
 
@@ -169,12 +166,12 @@ namespace Aws
                     VariantDetail::Checker::HasType<typename std::decay<T>::type, Ts...>::value,
                     "This variant does not have such alternative T.");
                 static_assert(
-                    sizeof(T) >= STORAGE_SIZE,
+                    sizeof(T) <= STORAGE_SIZE,
                     "Attempting to instantiate a Variant with a type bigger than all alternatives.");
 
                 using PlainT = typename std::decay<T>::type;
                 new (m_storage) PlainT(val);
-                m_index = VariantDetail::Index::GetIndexOf<T, Ts...>();
+                m_index = VariantDetail::Index::GetIndexOf<PlainT, Ts...>();
                 AWS_ASSERT(m_index != -1);
             }
 
@@ -189,7 +186,7 @@ namespace Aws
 
                 using PlainT = typename std::decay<T>::type;
                 new (m_storage) PlainT(std::forward<T>(val));
-                m_index = VariantDetail::Index::GetIndexOf<T, Ts...>();
+                m_index = VariantDetail::Index::GetIndexOf<PlainT, Ts...>();
                 AWS_ASSERT(m_index != -1);
             }
 
@@ -205,22 +202,24 @@ namespace Aws
 
                 using PlainT = typename std::decay<T>::type;
                 new (m_storage) PlainT(std::forward<Args>(args)...);
-                m_index = VariantDetail::Index::GetIndexOf<T, Ts...>();
+                m_index = VariantDetail::Index::GetIndexOf<PlainT, Ts...>();
                 AWS_ASSERT(m_index != -1);
             }
 
             Variant &operator=(const Variant &other)
             {
-                if (this != &other)
+                AWS_ASSERT(other.m_index != -1);
+                if (this != &other && other.m_index != -1)
                 {
                     if (m_index != other.m_index)
                     {
                         Destroy();
-                        CopyConstructUtil<0, Ts...>(other);
+                        m_index = other.m_index;
+                        VisitorUtil<0, Ts...>::VisitBinary(this, other, CopyMoveConstructor());
                     }
                     else
                     {
-                        CopyAssignUtil<0, Ts...>(other);
+                        VisitorUtil<0, Ts...>::VisitBinary(this, other, CopyMoveAssigner());
                     }
                 }
                 return *this;
@@ -228,16 +227,18 @@ namespace Aws
 
             Variant &operator=(Variant &&other)
             {
-                if (this != &other)
+                AWS_ASSERT(other.m_index != -1);
+                if (this != &other && other.m_index != -1)
                 {
                     if (m_index != other.m_index)
                     {
                         Destroy();
-                        MoveConstructUtil<0, Ts...>(std::move(other));
+                        m_index = other.m_index;
+                        VisitorUtil<0, Ts...>::VisitBinary(this, other, CopyMoveConstructor());
                     }
                     else
                     {
-                        MoveAssignUtil<0, Ts...>(std::move(other));
+                        VisitorUtil<0, Ts...>::VisitBinary(this, other, CopyMoveAssigner());
                     };
                 }
                 return *this;
@@ -258,7 +259,7 @@ namespace Aws
 
                 using PlainT = typename std::decay<T>::type;
                 new (m_storage) PlainT(std::forward<Args>(args)...);
-                m_index = VariantDetail::Index::GetIndexOf<T, Ts...>();
+                m_index = VariantDetail::Index::GetIndexOf<PlainT, Ts...>();
                 AWS_ASSERT(m_index != -1);
 
                 T *value = reinterpret_cast<T *>(m_storage);
@@ -271,7 +272,7 @@ namespace Aws
                 static_assert(Index < AlternativeCount, "Unknown alternative index to emplace");
                 using AlternativeT = typename ThisVariantAlternative<Index>::type;
 
-                return emplace<AlternativeT, Args...>(args...);
+                return emplace<AlternativeT, Args...>(std::forward<Args>(args)...);
             }
 
             template <typename T, EnableIfOtherIsThisVariantAlternative<T> = 1> bool holds_alternative() const
@@ -280,13 +281,10 @@ namespace Aws
                 return m_index == VariantDetail::Index::GetIndexOf<T, Ts...>();
             }
 
-            template <size_t Index> constexpr bool holds_alternative() const { return Index < AlternativeCount; }
-
-            template <typename T> bool holds_alternative() const { return false; }
-
             /* non-const get */
             template <typename T, EnableIfOtherIsThisVariantAlternative<T> = 1> T &get()
             {
+                AWS_FATAL_ASSERT(holds_alternative<T>());
                 T *value = reinterpret_cast<T *>(m_storage);
                 return *value;
             }
@@ -307,7 +305,7 @@ namespace Aws
             template <std::size_t Index> auto get() -> typename ThisVariantAlternative<Index>::type &
             {
                 static_assert(Index < AlternativeCount, "Unknown alternative index to get");
-                AWS_ASSERT(Index == m_index);
+                AWS_FATAL_ASSERT(holds_alternative<Index>());
                 using AlternativeT = typename ThisVariantAlternative<Index>::type;
                 AlternativeT *ret = reinterpret_cast<AlternativeT *>(m_storage);
                 return *ret;
@@ -387,192 +385,192 @@ namespace Aws
 
             ~Variant() { Destroy(); }
 
+            template <typename VisitorT> void Visit(VisitorT &&visitor)
+            {
+                return VisitorUtil<0, Ts...>::Visit(this, std::forward<VisitorT>(visitor));
+            }
+
           private:
             static constexpr std::size_t STORAGE_SIZE = VariantDetail::ParameterPackSize::GetMaxSizeOf<Ts...>();
 
             alignas(VariantDetail::ParameterPackSize::AlignAsPack<Ts...>()) char m_storage[STORAGE_SIZE];
-            VariantDetail::Index::VariantIndex m_index = -1;
-#if defined(DEBUG_BUILD)
+            IndexT m_index = -1;
+#if defined(AWS_CRT_ENABLE_VARIANT_DEBUG)
             VariantDetail::VariantDebug::VariantDebugBrowser<Ts...> browser = m_storage;
-#endif /* defined(DEBUG_BUILD) */
-
-            void Destroy()
-            {
-                if (m_index != -1)
-                {
-                    DestroyUtil<Ts...>(m_index);
-                }
-                m_index = -1;
-            }
+#endif /* defined(AWS_CRT_ENABLE_VARIANT_DEBUG) */
 
-            template <typename First, typename Second, typename... Rest>
-            void DestroyUtil(const std::size_t requestedToDestroy, std::size_t curIndex = 0)
-            {
-                if (curIndex == requestedToDestroy)
-                {
-                    First *value = reinterpret_cast<First *>(m_storage);
-                    value->~First();
-                }
-                else
-                {
-                    DestroyUtil<Second, Rest...>(requestedToDestroy, ++curIndex);
-                }
-            }
+            template <size_t Index> constexpr bool holds_alternative() const { return Index == m_index; }
 
-            template <typename Last> void DestroyUtil(const std::size_t requestedToDestroy, std::size_t curIndex = 0)
+            struct Destroyer
             {
-                AWS_ASSERT(
-                    requestedToDestroy == curIndex); // attempting to destroy unknown alternative type in a Variant
-                if (curIndex == requestedToDestroy)
+                template <typename AlternativeT> void operator()(AlternativeT &&value) const
                 {
-                    Last *value = reinterpret_cast<Last *>(m_storage);
-                    value->~Last();
+                    using PlaintT = typename std::remove_reference<AlternativeT>::type;
+                    value.~PlaintT();
                 }
-            }
+            };
 
-            template <short Index, typename First, typename Second, typename... Rest>
-            void CopyConstructUtil(const Variant &other)
+            void Destroy()
             {
-                static_assert(Index < AlternativeCount, "Attempting to construct unknown Index Type");
+                AWS_FATAL_ASSERT(m_index != -1);
+                Visit(Destroyer());
 
-                if (Index == other.m_index)
-                {
-                    using AlternativeT = typename ThisVariantAlternative<Index>::type;
-                    new (m_storage) AlternativeT(other.get<Index>());
-                    m_index = Index;
-                    AWS_ASSERT(m_index != -1);
-                }
-                else
-                {
-                    CopyConstructUtil<Index + 1, Second, Rest...>(other);
-                }
+                m_index = -1;
             }
 
-            template <short Index, typename Last> void CopyConstructUtil(const Variant &other)
+            struct CopyMoveConstructor
             {
-                static_assert(Index < AlternativeCount, "Attempting to construct unknown Index Type");
-
-                if (Index == other.m_index)
-                {
-                    using AlternativeT = typename ThisVariantAlternative<Index>::type;
-                    new (m_storage) AlternativeT(other.get<Index>());
-                    m_index = Index;
-                    AWS_ASSERT(m_index != -1);
-                }
-                else
+                template <typename AlternativeT> void operator()(AlternativeT &&value, AlternativeT &&other) const
                 {
-                    AWS_ASSERT(!"Unknown variant alternative type in other!");
+                    using PlaintT = typename std::remove_reference<AlternativeT>::type;
+                    new (&value) PlaintT(std::move<AlternativeT>(other));
                 }
-            }
-
-            template <short Index, typename First, typename Second, typename... Rest>
-            void MoveConstructUtil(Variant &&other)
-            {
-                static_assert(Index < AlternativeCount, "Attempting to construct unknown Index Type");
 
-                if (Index == other.m_index)
+                template <typename AlternativeT, typename ConstAlternativeT>
+                void operator()(AlternativeT &&value, ConstAlternativeT &other) const
                 {
-                    using AlternativeT = typename ThisVariantAlternative<Index>::type;
-                    new (m_storage) AlternativeT(std::move(other.get<Index>()));
-                    m_index = Index;
-                    AWS_ASSERT(m_index != -1);
-                }
-                else
-                {
-                    MoveConstructUtil<Index + 1, Second, Rest...>(std::move(other));
+                    using PlaintT = typename std::remove_reference<AlternativeT>::type;
+                    using PlaintOtherT =
+                        typename std::remove_const<typename std::remove_reference<AlternativeT>::type>::type;
+                    static_assert(std::is_same<PlaintT, PlaintOtherT>::value, "Incompatible types");
+
+                    new (&value) PlaintT(other);
                 }
-            }
+            };
 
-            template <short Index, typename Last> void MoveConstructUtil(Variant &&other)
+            struct CopyMoveAssigner
             {
-                static_assert(Index < AlternativeCount, "Attempting to construct unknown Index Type");
-
-                if (Index == other.m_index)
+                template <typename AlternativeT> void operator()(AlternativeT &&value, AlternativeT &&other) const
                 {
-                    using AlternativeT = typename ThisVariantAlternative<Index>::type;
-                    new (m_storage) AlternativeT(std::move(other.get<Index>()));
-                    m_index = Index;
-                    AWS_ASSERT(m_index != -1);
+                    value = std::move(other);
                 }
-                else
+
+                template <typename AlternativeT, typename ConstAlternativeT>
+                void operator()(AlternativeT &&value, ConstAlternativeT &other) const
                 {
-                    AWS_ASSERT(!"Unknown variant alternative type in other!");
+                    using PlaintT = typename std::remove_reference<AlternativeT>::type;
+                    using PlaintOtherT =
+                        typename std::remove_const<typename std::remove_reference<AlternativeT>::type>::type;
+                    static_assert(std::is_same<PlaintT, PlaintOtherT>::value, "Incompatible types");
+
+                    value = std::move(other);
                 }
-            }
+            };
 
-            template <short Index, typename First, typename Second, typename... Rest>
-            void CopyAssignUtil(const Variant &other)
-            {
-                static_assert(Index < AlternativeCount, "Attempting to construct unknown Index Type");
+            template <IndexT Index, typename... Args> struct VisitorUtil;
 
-                if (Index == other.m_index)
-                {
-                    using AlternativeT = typename ThisVariantAlternative<Index>::type;
-                    AlternativeT *value = reinterpret_cast<AlternativeT *>(m_storage);
-                    *value = other.get<Index>();
-                    m_index = Index;
-                    AWS_ASSERT(m_index != -1);
-                }
-                else
+            template <IndexT Index, typename First, typename Second, typename... Rest>
+            struct VisitorUtil<Index, First, Second, Rest...>
+            {
+                template <typename VisitorStruct> static void Visit(Variant *pThis, VisitorStruct &&visitor)
                 {
-                    CopyAssignUtil<Index + 1, Second, Rest...>(other);
-                }
-            }
+                    static_assert(Index < AlternativeCount, "Attempting to visit unknown Index Type");
 
-            template <short Index, typename Last> void CopyAssignUtil(const Variant &other)
-            {
-                static_assert(Index < AlternativeCount, "Attempting to construct unknown Index Type");
+                    if (Index == pThis->m_index)
+                    {
+                        using AlternativeT = typename ThisVariantAlternative<Index>::type;
+                        AlternativeT *value = reinterpret_cast<AlternativeT *>(pThis->m_storage);
+                        visitor(*value);
+                    }
+                    else
+                    {
+                        VisitorUtil<Index + 1, Second, Rest...>::Visit(pThis, std::forward<VisitorStruct>(visitor));
+                    }
+                }
 
-                if (Index == other.m_index)
+                template <typename VisitorStruct>
+                static void VisitBinary(Variant<Ts...> *pThis, Variant<Ts...> &&other, VisitorStruct &&visitor)
                 {
-                    using AlternativeT = typename ThisVariantAlternative<Index>::type;
-                    AlternativeT *value = reinterpret_cast<AlternativeT *>(m_storage);
-                    *value = other.get<Index>();
-                    m_index = Index;
-                    AWS_ASSERT(m_index != -1);
+                    static_assert(Index < AlternativeCount, "Attempting to visit unknown Index Type");
+
+                    if (Index == pThis->m_index)
+                    {
+                        using AlternativeT = typename ThisVariantAlternative<Index>::type;
+                        AlternativeT *value = reinterpret_cast<AlternativeT *>(pThis->m_storage);
+                        AlternativeT &&otherValue = other.get<AlternativeT>();
+                        visitor(*value, std::move<AlternativeT>(otherValue));
+                    }
+                    else
+                    {
+                        VisitorUtil<Index + 1, Second, Rest...>::Visit(
+                            pThis, std::move<Variant<Ts...>>(other), std::forward<VisitorStruct>(visitor));
+                    }
                 }
-                else
+
+                template <typename VisitorStruct>
+                static void VisitBinary(Variant<Ts...> *pThis, const Variant<Ts...> &other, VisitorStruct &&visitor)
                 {
-                    AWS_ASSERT(!"Unknown variant alternative type in other!");
+                    static_assert(Index < AlternativeCount, "Attempting to visit unknown Index Type");
+
+                    if (Index == pThis->m_index)
+                    {
+                        using AlternativeT = typename ThisVariantAlternative<Index>::type;
+                        AlternativeT *value = reinterpret_cast<AlternativeT *>(pThis->m_storage);
+                        const AlternativeT &otherValue = other.get<AlternativeT>();
+                        visitor(*value, otherValue);
+                    }
+                    else
+                    {
+                        VisitorUtil<Index + 1, Second, Rest...>::VisitBinary(
+                            pThis, other, std::forward<VisitorStruct>(visitor));
+                    }
                 }
-            }
+            };
 
-            template <short Index, typename First, typename Second, typename... Rest>
-            void MoveAssignUtil(Variant &&other)
+            template <IndexT Index, typename Last> struct VisitorUtil<Index, Last>
             {
-                static_assert(Index < AlternativeCount, "Attempting to construct unknown Index Type");
-
-                if (Index == other.m_index)
-                {
-                    using AlternativeT = typename ThisVariantAlternative<Index>::type;
-                    AlternativeT *value = reinterpret_cast<AlternativeT *>(m_storage);
-                    *value = std::move(other.get<Index>());
-                    m_index = Index;
-                    AWS_ASSERT(m_index != -1);
-                }
-                else
+                template <typename VisitorStruct> static void Visit(Variant *pThis, VisitorStruct &&visitor)
                 {
-                    MoveAssignUtil<Index + 1, Second, Rest...>(std::move(other));
-                }
-            }
+                    static_assert(Index < AlternativeCount, "Attempting to visit unknown Index Type");
 
-            template <short Index, typename Last> void MoveAssignUtil(Variant &&other)
-            {
-                static_assert(Index < AlternativeCount, "Attempting to construct unknown Index Type");
+                    if (Index == pThis->m_index)
+                    {
+                        using AlternativeT = typename ThisVariantAlternative<Index>::type;
+                        AlternativeT *value = reinterpret_cast<AlternativeT *>(pThis->m_storage);
+                        visitor(*value);
+                    }
+                    else
+                    {
+                        AWS_FATAL_ASSERT(!"Unknown variant alternative to visit!");
+                    }
+                }
 
-                if (Index == other.m_index)
+                template <typename VisitorStruct>
+                static void VisitBinary(Variant<Ts...> *pThis, Variant<Ts...> &&other, VisitorStruct &&visitor)
                 {
-                    using AlternativeT = typename ThisVariantAlternative<Index>::type;
-                    AlternativeT *value = reinterpret_cast<AlternativeT *>(m_storage);
-                    *value = std::move(other.get<Index>());
-                    m_index = Index;
-                    AWS_ASSERT(m_index != -1);
+                    static_assert(Index < AlternativeCount, "Attempting to visit unknown Index Type");
+
+                    if (Index == pThis->m_index)
+                    {
+                        using AlternativeT = typename ThisVariantAlternative<Index>::type;
+                        AlternativeT *value = reinterpret_cast<AlternativeT *>(pThis->m_storage);
+                        AlternativeT &&otherValue = other.get<AlternativeT>();
+                        visitor(*value, otherValue);
+                    }
+                    else
+                    {
+                        AWS_FATAL_ASSERT(!"Unknown variant alternative to visit!");
+                    }
                 }
-                else
+
+                template <typename VisitorStruct>
+                static void VisitBinary(Variant<Ts...> *pThis, const Variant<Ts...> &other, VisitorStruct &&visitor)
                 {
-                    AWS_ASSERT(!"Unknown variant alternative type in other!");
+                    static_assert(Index < AlternativeCount, "Attempting to visit unknown Index Type");
+
+                    if (Index == pThis->m_index)
+                    {
+                        using AlternativeT = typename ThisVariantAlternative<Index>::type;
+                        AlternativeT *value = reinterpret_cast<AlternativeT *>(pThis->m_storage);
+                        const AlternativeT &otherValue = other.get<AlternativeT>();
+                        visitor(*value, otherValue);
+                    }
+                    else
+                    {
+                        AWS_FATAL_ASSERT(!"Unknown variant alternative to visit!");
+                    }
                 }
-            }
+            };
         };
 
         /* Helper template to get an actual type from an Index */
diff --git a/tests/VariantTest.cpp b/tests/VariantTest.cpp
index 2baff2f2c..d8d62b5c6 100644
--- a/tests/VariantTest.cpp
+++ b/tests/VariantTest.cpp
@@ -208,6 +208,32 @@ static int s_VariantOperatorEquals(struct aws_allocator *allocator, void *ctx)
 
 AWS_TEST_CASE(VariantOperatorEquals, s_VariantOperatorEquals)
 
+struct TestStringOnlyVisitor
+{
+    /* can't specialize member function templates, so using such syntax of dummy structs */
+    template <typename... Args> struct MyVisitUtil
+    {
+        static void Visit(Args &...args)
+        {
+            ; // not a string
+        }
+    };
+
+    template <typename AlternativeT> void operator()(AlternativeT &val) const
+    {
+        MyVisitUtil<typename std::remove_reference<AlternativeT>::type>::Visit(val);
+    }
+};
+
+template <> struct TestStringOnlyVisitor::MyVisitUtil<Aws::Crt::String>
+{
+    static void Visit(Aws::Crt::String &val)
+    {
+        auto index = val.find("another");
+        val.replace(index, 7, "visited");
+    }
+};
+
 static int s_VariantEmplace(struct aws_allocator *allocator, void *ctx)
 {
     (void)ctx;
@@ -223,8 +249,17 @@ static int s_VariantEmplace(struct aws_allocator *allocator, void *ctx)
             var1.emplace<int>(65535);
             ASSERT_INT_EQUALS(65535, var1.get<int>());
 
+            var1.emplace<0>(1337);
+            ASSERT_INT_EQUALS(1337, var1.get<int>());
+
             var1.emplace<Aws::Crt::String>(Aws::Crt::String("This is a string."));
             ASSERT_STR_EQUALS("This is a string.", var1.get<Aws::Crt::String>().c_str());
+
+            var1.emplace<2>(Aws::Crt::String("This is another string."));
+            ASSERT_STR_EQUALS("This is another string.", var1.get<Aws::Crt::String>().c_str());
+
+            var1.Visit(TestStringOnlyVisitor());
+            ASSERT_STR_EQUALS("This is visited string.", var1.get<Aws::Crt::String>().c_str());
         }
     }