diff --git a/cpp/test/Ice/custom/AllTests.cpp b/cpp/test/Ice/custom/AllTests.cpp
index e63d11fd49d..4972726a5c4 100644
--- a/cpp/test/Ice/custom/AllTests.cpp
+++ b/cpp/test/Ice/custom/AllTests.cpp
@@ -148,89 +148,6 @@ allTests(Test::TestHelper* helper)
         test(ret == in);
     }
 
-    {
-        Test::BoolSeq in(5);
-        in[0] = false;
-        in[1] = true;
-        in[2] = true;
-        in[3] = false;
-        in[4] = true;
-        Test::BoolSeq out;
-        Test::BoolSeq ret = t->opBoolRange(in, out);
-        test(out == in);
-        test(ret == in);
-    }
-
-    {
-        Test::ByteList in;
-        in.push_back('1');
-        in.push_back('2');
-        in.push_back('3');
-        in.push_back('4');
-        in.push_back('5');
-        Test::ByteList out;
-        Test::ByteList ret = t->opByteRange(in, out);
-        test(out == in);
-        test(ret == in);
-    }
-
-    {
-        Test::VariableList in;
-        Test::Variable v;
-        v.s = "THESE";
-        in.push_back(v);
-        v.s = "ARE";
-        in.push_back(v);
-        v.s = "FIVE";
-        in.push_back(v);
-        v.s = "SHORT";
-        in.push_back(v);
-        v.s = "STRINGS.";
-        in.push_back(v);
-        Test::VariableList out;
-        Test::VariableList ret = t->opVariableRange(in, out);
-        test(out == in);
-        test(ret == in);
-    }
-
-    {
-        Test::ByteList in;
-        in.push_back('1');
-        in.push_back('2');
-        in.push_back('3');
-        in.push_back('4');
-        in.push_back('5');
-        Test::ByteList out;
-        Test::ByteList ret = t->opByteRangeType(in, out);
-        test(out == in);
-        test(ret == in);
-    }
-
-    {
-        Test::VariableList in;
-        deque<Test::Variable> inSeq;
-        Test::Variable v;
-        v.s = "THESE";
-        in.push_back(v);
-        inSeq.push_back(v);
-        v.s = "ARE";
-        in.push_back(v);
-        inSeq.push_back(v);
-        v.s = "FIVE";
-        in.push_back(v);
-        inSeq.push_back(v);
-        v.s = "SHORT";
-        in.push_back(v);
-        inSeq.push_back(v);
-        v.s = "STRINGS.";
-        in.push_back(v);
-        inSeq.push_back(v);
-        Test::VariableList out;
-        Test::VariableList ret = t->opVariableRangeType(in, out);
-        test(out == in);
-        test(ret == in);
-    }
-
     {
         deque<bool> in(5);
         in[0] = false;
@@ -700,86 +617,6 @@ allTests(Test::TestHelper* helper)
             test(std::get<0>(r) == in);
         }
 
-        {
-            Test::BoolSeq in(5);
-            in[0] = false;
-            in[1] = true;
-            in[2] = true;
-            in[3] = false;
-            in[4] = true;
-            auto r = t->opBoolRangeAsync(in).get();
-            test(std::get<1>(r) == in);
-            test(std::get<0>(r) == in);
-        }
-
-        {
-            Test::ByteList in;
-            in.push_back('1');
-            in.push_back('2');
-            in.push_back('3');
-            in.push_back('4');
-            in.push_back('5');
-
-            auto r = t->opByteRangeAsync(in).get();
-            test(std::get<1>(r) == in);
-            test(std::get<0>(r) == in);
-        }
-
-        {
-            Test::VariableList in;
-            Test::Variable v;
-            v.s = "THESE";
-            in.push_back(v);
-            v.s = "ARE";
-            in.push_back(v);
-            v.s = "FIVE";
-            in.push_back(v);
-            v.s = "SHORT";
-            in.push_back(v);
-            v.s = "STRINGS.";
-            in.push_back(v);
-            auto r = t->opVariableRangeAsync(in).get();
-            test(std::get<1>(r) == in);
-            test(std::get<0>(r) == in);
-        }
-
-        {
-            Test::ByteList in;
-            in.push_back('1');
-            in.push_back('2');
-            in.push_back('3');
-            in.push_back('4');
-            in.push_back('5');
-            auto r = t->opByteRangeTypeAsync(in).get();
-            test(std::get<1>(r) == in);
-            test(std::get<0>(r) == in);
-        }
-
-        {
-            Test::VariableList in;
-            deque<Test::Variable> inSeq;
-            Test::Variable v;
-            v.s = "THESE";
-            in.push_back(v);
-            inSeq.push_back(v);
-            v.s = "ARE";
-            in.push_back(v);
-            inSeq.push_back(v);
-            v.s = "FIVE";
-            in.push_back(v);
-            inSeq.push_back(v);
-            v.s = "SHORT";
-            in.push_back(v);
-            inSeq.push_back(v);
-            v.s = "STRINGS.";
-            in.push_back(v);
-            inSeq.push_back(v);
-
-            auto r = t->opVariableRangeTypeAsync(in).get();
-            test(std::get<1>(r) == in);
-            test(std::get<0>(r) == in);
-        }
-
         {
             deque<bool> in(5);
             in[0] = false;
@@ -1078,18 +915,6 @@ allTests(Test::TestHelper* helper)
             test(r.size() == in.size());
             test(r == in);
         }
-
-        {
-            Test::ByteSeq in;
-            in.push_back('1');
-            in.push_back('2');
-            in.push_back('3');
-            in.push_back('4');
-
-            auto r = t->opOutRangeByteSeqAsync(in).get();
-            test(r.size() == in.size());
-            test(r == in);
-        }
     }
     cout << "ok" << endl;
 
@@ -1219,148 +1044,6 @@ allTests(Test::TestHelper* helper)
         test(done.get_future().get());
     }
 
-    {
-        Test::BoolSeq in(5);
-        in[0] = false;
-        in[1] = true;
-        in[2] = true;
-        in[3] = false;
-        in[4] = true;
-
-        promise<bool> done;
-
-        t->opBoolRangeAsync(in,
-                            [&](Test::BoolSeq ret, Test::BoolSeq out)
-                            {
-                                   test(ret == in);
-                                   test(out == in);
-                                   done.set_value(true);
-                            },
-                            [&](std::exception_ptr)
-                            {
-                                done.set_value(false);
-                            });
-
-        test(done.get_future().get());
-    }
-
-    {
-        Test::ByteList in;
-        in.push_back('1');
-        in.push_back('2');
-        in.push_back('3');
-        in.push_back('4');
-        in.push_back('5');
-
-        promise<bool> done;
-
-        t->opByteRangeAsync(in,
-                            [&](Test::ByteList ret, Test::ByteList out)
-                            {
-                                test(ret == in);
-                                test(out == in);
-                                done.set_value(true);
-                            },
-                            [&](std::exception_ptr)
-                            {
-                                done.set_value(false);
-                            });
-
-        test(done.get_future().get());
-    }
-
-    {
-        Test::VariableList in;
-        Test::Variable v;
-        v.s = "THESE";
-        in.push_back(v);
-        v.s = "ARE";
-        in.push_back(v);
-        v.s = "FIVE";
-        in.push_back(v);
-        v.s = "SHORT";
-        in.push_back(v);
-        v.s = "STRINGS.";
-        in.push_back(v);
-
-        promise<bool> done;
-
-        t->opVariableRangeAsync(in,
-                                [&](Test::VariableList ret, Test::VariableList out)
-                                {
-                                    test(ret == in);
-                                    test(out == in);
-                                    done.set_value(true);
-                                },
-                                [&](std::exception_ptr)
-                                {
-                                    done.set_value(false);
-                                });
-
-        test(done.get_future().get());
-    }
-
-    {
-        Test::ByteList in;
-        in.push_back('1');
-        in.push_back('2');
-        in.push_back('3');
-        in.push_back('4');
-        in.push_back('5');
-
-        promise<bool> done;
-
-        t->opByteRangeTypeAsync(in,
-                                [&](Test::ByteList ret, Test::ByteList out)
-                                {
-                                    test(ret == in);
-                                    test(out == in);
-                                    done.set_value(true);
-                                },
-                                [&](std::exception_ptr)
-                                {
-                                    done.set_value(false);
-                                });
-
-        test(done.get_future().get());
-    }
-
-    {
-        Test::VariableList in;
-        deque<Test::Variable> inSeq;
-        Test::Variable v;
-        v.s = "THESE";
-        in.push_back(v);
-        inSeq.push_back(v);
-        v.s = "ARE";
-        in.push_back(v);
-        inSeq.push_back(v);
-        v.s = "FIVE";
-        in.push_back(v);
-        inSeq.push_back(v);
-        v.s = "SHORT";
-        in.push_back(v);
-        inSeq.push_back(v);
-        v.s = "STRINGS.";
-        in.push_back(v);
-        inSeq.push_back(v);
-        promise<bool> done;
-
-        t->opVariableRangeTypeAsync(in,
-                                    [&](Test::VariableList ret, Test::VariableList out)
-                                    {
-                                        test(ret == in);
-                                        test(out == in);
-                                        done.set_value(true);
-                                    },
-                                    [&](std::exception_ptr)
-                                    {
-                                        done.set_value(false);
-                                    });
-
-        test(done.get_future().get());
-    }
-
     {
         deque<bool> in(5);
         in[0] = false;
@@ -1884,29 +1567,6 @@ allTests(Test::TestHelper* helper)
         test(done.get_future().get());
     }
 
-    {
-        Test::ByteSeq in;
-        in.push_back('1');
-        in.push_back('2');
-        in.push_back('3');
-        in.push_back('4');
-
-        promise<bool> done;
-
-        t->opOutRangeByteSeqAsync(in,
-                                  [&](Test::ByteSeq out)
-                                  {
-                                      test(out == in);
-                                      done.set_value(true);
-                                  },
-                                  [&](std::exception_ptr)
-                                  {
-                                      done.set_value(false);
-                                  });
-
-        test(done.get_future().get());
-    }
-
     cout << "ok" << endl;
 
     cout << "testing alternate dictionaries with new AMI... " << flush;
diff --git a/cpp/test/Ice/custom/Test.ice b/cpp/test/Ice/custom/Test.ice
index 675f7884c78..72a50747990 100644
--- a/cpp/test/Ice/custom/Test.ice
+++ b/cpp/test/Ice/custom/Test.ice
@@ -130,19 +130,6 @@ interface TestIntf
 
     ["cpp:array"] VariableList opVariableArray(["cpp:array"] VariableList inSeq, out ["cpp:array"] VariableList outSeq);
 
-    ["cpp:range"] BoolSeq opBoolRange(["cpp:range"] BoolSeq inSeq, out ["cpp:range"] BoolSeq outSeq);
-
-    ["cpp:range"] ByteList opByteRange(["cpp:range"] ByteList inSeq, out ["cpp:range"] ByteList outSeq);
-
-    ["cpp:range"] VariableList opVariableRange(["cpp:range"] VariableList inSeq, out ["cpp:range"] VariableList outSeq);
-
-    ["cpp:range:::Test::ByteList"] ByteList opByteRangeType(["cpp:range:::Test::ByteList"] ByteList inSeq,
-                                                            out ["cpp:range:::Test::ByteList"] ByteList outSeq);
-
-    ["cpp:range:std::deque< ::Test::Variable>"] VariableList
-    opVariableRangeType(["cpp:range:std::deque< ::Test::Variable>"] VariableList inSeq,
-                        out ["cpp:range:std::deque< ::Test::Variable>"] VariableList outSeq);
-
     ["cpp:type:std::deque<bool>"] BoolSeq
     opBoolSeq(["cpp:type:std::deque<bool>"] BoolSeq inSeq, out ["cpp:type:std::deque<bool>"]BoolSeq outSeq);
 
@@ -151,8 +138,6 @@ interface TestIntf
     BoolDequeList opBoolDequeList(BoolDequeList inSeq, out BoolDequeList outSeq);
     ["cpp:array"] BoolDequeList opBoolDequeListArray(["cpp:array"] BoolDequeList inSeq,
                                                 out ["cpp:array"] BoolDequeList outSeq);
-    ["cpp:range"] BoolDequeList opBoolDequeListRange(["cpp:range"] BoolDequeList inSeq,
-                                                out ["cpp:range"] BoolDequeList outSeq);
 
     ["cpp:type:std::deque< ::Ice::Byte>"] ByteSeq
     opByteSeq(["cpp:type:std::deque< ::Ice::Byte>"] ByteSeq inSeq,
@@ -206,8 +191,6 @@ interface TestIntf
 
     void opOutArrayByteSeq(ByteSeq org, out ["cpp:array"] ByteSeq copy);
 
-    void opOutRangeByteSeq(ByteSeq org, out ["cpp:range"] ByteSeq copy);
-
     IntStringDict opIntStringDict(IntStringDict idict, out IntStringDict odict);
 
     ["cpp:type:::Test::CustomMap< int64_t, int64_t>"] LongLongDict
diff --git a/cpp/test/Ice/custom/TestAMD.ice b/cpp/test/Ice/custom/TestAMD.ice
index 2ddcdad7ac7..7643eb14980 100644
--- a/cpp/test/Ice/custom/TestAMD.ice
+++ b/cpp/test/Ice/custom/TestAMD.ice
@@ -128,17 +128,6 @@ struct BufferStruct
 
     VariableList opVariableArray(["cpp:array"] VariableList inSeq, out VariableList outSeq);
 
-    BoolSeq opBoolRange(["cpp:range"] BoolSeq inSeq, out BoolSeq outSeq);
-
-    ["cpp:range"] ByteList opByteRange(["cpp:range"] ByteList inSeq, out ["cpp:range"] ByteList outSeq);
-
-    VariableList opVariableRange(["cpp:range"] VariableList inSeq, out VariableList outSeq);
-
-    ByteList opByteRangeType(["cpp:range:::Test::ByteList"] ByteList inSeq, out ByteList outSeq);
-
-    VariableList
-    opVariableRangeType(["cpp:range:std::deque< ::Test::Variable>"] VariableList inSeq, out VariableList outSeq);
-
     ["cpp:type:std::deque<bool>"] BoolSeq
     opBoolSeq(["cpp:type:std::deque<bool>"] BoolSeq inSeq, out ["cpp:type:std::deque<bool>"]BoolSeq outSeq);
 
@@ -196,8 +185,6 @@ struct BufferStruct
 
     void opOutArrayByteSeq(ByteSeq org, out ["cpp:array"] ByteSeq copy);
 
-    void opOutRangeByteSeq(ByteSeq org, out ["cpp:range"] ByteSeq copy);
-
     IntStringDict opIntStringDict(IntStringDict idict, out IntStringDict odict);
 
     ["cpp:type:::Test::CustomMap< int64_t, int64_t>"] LongLongDict
diff --git a/cpp/test/Ice/custom/TestAMDI.cpp b/cpp/test/Ice/custom/TestAMDI.cpp
index dad153a16f8..c2d38d943ee 100644
--- a/cpp/test/Ice/custom/TestAMDI.cpp
+++ b/cpp/test/Ice/custom/TestAMDI.cpp
@@ -41,47 +41,6 @@ TestIntfI::opVariableArrayAsync(std::pair<const Test::Variable*, const Test::Var
     response(out, out);
 }
 
-void
-TestIntfI::opBoolRangeAsync(Test::BoolSeq in,
-                            std::function<void(const Test::BoolSeq&, const Test::BoolSeq&)> response,
-                            std::function<void(std::exception_ptr)>, const Ice::Current&)
-{
-    response(in, in);
-}
-
-void
-TestIntfI::opByteRangeAsync(Test::ByteList in,
-                            std::function<void(const Test::ByteList&, const Test::ByteList&)> response,
-                            std::function<void(std::exception_ptr)>, const Ice::Current&)
-{
-    response(in, in);
-}
-
-void
-TestIntfI::opVariableRangeAsync(Test::VariableList in,
-                                std::function<void(const Test::VariableList&, const Test::VariableList&)> response,
-                                std::function<void(std::exception_ptr)>, const Ice::Current&)
-{
-    response(in, in);
-}
-
-void
-TestIntfI::opByteRangeTypeAsync(Test::ByteList in,
-                                std::function<void(const Test::ByteList&, const Test::ByteList&)> response,
-                                std::function<void(std::exception_ptr)>, const Ice::Current&)
-{
-    response(in, in);
-}
-
-void
-TestIntfI::opVariableRangeTypeAsync(Test::VariableList in,
-                                    std::function<void(const Test::VariableList&,
-                                                        const Test::VariableList&)> response,
-                                    std::function<void(std::exception_ptr)>, const Ice::Current&)
-{
-    response(in, in);
-}
-
 void
 TestIntfI::opBoolSeqAsync(std::deque<bool> in,
                           std::function<void(const std::deque<bool>&, const std::deque<bool>&)> response,
@@ -248,14 +207,6 @@ TestIntfI::opOutArrayByteSeqAsync(Test::ByteSeq in,
     response(std::make_pair(in.data(), in.data() + in.size()));
 }
 
-void
-TestIntfI::opOutRangeByteSeqAsync(Test::ByteSeq in,
-                                  std::function<void(const Test::ByteSeq&)> response,
-                                  std::function<void(std::exception_ptr)>, const Ice::Current&)
-{
-    response(in);
-}
-
 void
 TestIntfI::opIntStringDictAsync(Test::IntStringDict in,
                                 std::function<void(const Test::IntStringDict&, const Test::IntStringDict&)> response,
diff --git a/cpp/test/Ice/custom/TestAMDI.h b/cpp/test/Ice/custom/TestAMDI.h
index 707b5432288..4705011d4b5 100644
--- a/cpp/test/Ice/custom/TestAMDI.h
+++ b/cpp/test/Ice/custom/TestAMDI.h
@@ -27,27 +27,6 @@ class TestIntfI : public virtual Test::TestIntf
                               std::function<void(const ::Test::VariableList&, const ::Test::VariableList&)>,
                               std::function<void(std::exception_ptr)>, const Ice::Current&) override;
 
-    void opBoolRangeAsync(Test::BoolSeq,
-                          std::function<void(const ::Test::BoolSeq&, const ::Test::BoolSeq&)>,
-                          std::function<void(std::exception_ptr)>, const Ice::Current&) override;
-
-    void opByteRangeAsync(Test::ByteList,
-                          std::function<void(const Test::ByteList&, const Test::ByteList&)>,
-                          std::function<void(std::exception_ptr)>, const Ice::Current&) override;
-
-    void opVariableRangeAsync(Test::VariableList,
-                              std::function<void(const ::Test::VariableList&, const ::Test::VariableList&)>,
-                              std::function<void(std::exception_ptr)>, const Ice::Current&) override;
-
-    void opByteRangeTypeAsync(Test::ByteList,
-                              std::function<void(const ::Test::ByteList&, const ::Test::ByteList&)>,
-                              std::function<void(std::exception_ptr)>, const Ice::Current&) override;
-
-    void opVariableRangeTypeAsync(Test::VariableList,
-                                  std::function<void(const ::Test::VariableList&,
-                                                      const ::Test::VariableList&)>,
-                                  std::function<void(std::exception_ptr)>, const Ice::Current&) override;
-
     void opBoolSeqAsync(std::deque<bool>,
                         std::function<void(const std::deque<bool>&, const std::deque<bool>&)>,
                         std::function<void(std::exception_ptr)>, const Ice::Current&) override;
@@ -134,10 +113,6 @@ class TestIntfI : public virtual Test::TestIntf
                                 std::function<void(const std::pair<const ::Ice::Byte*, const ::Ice::Byte*>&)>,
                                 std::function<void(std::exception_ptr)>, const Ice::Current&) override;
 
-    void opOutRangeByteSeqAsync(::Test::ByteSeq,
-                                std::function<void(const Test::ByteSeq&)>,
-                                std::function<void(std::exception_ptr)>, const Ice::Current&) override;
-
     void opIntStringDictAsync(::Test::IntStringDict,
                               std::function<void(const ::Test::IntStringDict&, const ::Test::IntStringDict&)>,
                               std::function<void(std::exception_ptr)>, const Ice::Current&) override;
diff --git a/cpp/test/Ice/custom/TestI.cpp b/cpp/test/Ice/custom/TestI.cpp
index 7cad5eae18d..5844a01d03d 100644
--- a/cpp/test/Ice/custom/TestI.cpp
+++ b/cpp/test/Ice/custom/TestI.cpp
@@ -41,13 +41,6 @@ TestIntfI::opVariableArray(std::pair<const Test::Variable*, const Test::Variable
     return outSeq;
 }
 
-Test::BoolSeq
-TestIntfI::opBoolRange(Test::BoolSeq inSeq, Test::BoolSeq& outSeq, const Ice::Current&)
-{
-    outSeq.swap(inSeq);
-    return outSeq;
-}
-
 Test::ByteList
 TestIntfI::opByteRange(Test::ByteList inSeq, Test::ByteList& outSeq, const Ice::Current&)
 {
diff --git a/cpp/test/Ice/custom/TestI.h b/cpp/test/Ice/custom/TestI.h
index bbd963f3c01..edd163d4a7e 100644
--- a/cpp/test/Ice/custom/TestI.h
+++ b/cpp/test/Ice/custom/TestI.h
@@ -27,8 +27,6 @@ class TestIntfI : public virtual Test::TestIntf
                                                Test::VariableList&,
                                                const Ice::Current&);
 
-    virtual Test::BoolSeq opBoolRange(Test::BoolSeq, Test::BoolSeq&, const Ice::Current&);
-
     virtual Test::ByteList opByteRange(Test::ByteList, Test::ByteList&, const Ice::Current&);
 
     virtual Test::VariableList
diff --git a/cpp/test/Ice/optional/Test.ice b/cpp/test/Ice/optional/Test.ice
index 7fa5bd4586a..6c00298279a 100644
--- a/cpp/test/Ice/optional/Test.ice
+++ b/cpp/test/Ice/optional/Test.ice
@@ -262,8 +262,7 @@ interface Initial
     ["cpp:array"] optional(1) DoubleSeq opDoubleSeq(["cpp:array"] optional(2) DoubleSeq p1,
                                                      out ["cpp:array"] optional(3) DoubleSeq p3);
 
-    ["cpp:range"] optional(1) StringSeq opStringSeq(["cpp:range"] optional(2) StringSeq p1,
-                                                    out ["cpp:range"] optional(3) StringSeq p3);
+    optional(1) StringSeq opStringSeq(optional(2) StringSeq p1, out optional(3) StringSeq p3);
 
     ["cpp:array"] optional(1) SmallStructSeq opSmallStructSeq(["cpp:array"] optional(2) SmallStructSeq p1,
                                                               out ["cpp:array"] optional(3) SmallStructSeq p3);
@@ -277,8 +276,7 @@ interface Initial
     ["cpp:array"] optional(1) FixedStructList opFixedStructList(["cpp:array"] optional(2) FixedStructList p1,
                                                                 out ["cpp:array"] optional(3) FixedStructList p3);
 
-    ["cpp:range"] optional(1) VarStructSeq opVarStructSeq(["cpp:range"] optional(2) VarStructSeq p1,
-                                                          out ["cpp:range"] optional(3) VarStructSeq p3);
+    optional(1) VarStructSeq opVarStructSeq(optional(2) VarStructSeq p1, out optional(3) VarStructSeq p3);
 
     optional(1) Serializable opSerializable(optional(2) Serializable p1, out optional(3) Serializable p3);
 
diff --git a/cpp/test/Ice/optional/TestAMD.ice b/cpp/test/Ice/optional/TestAMD.ice
index 3bbbe525ea0..1d29a405869 100644
--- a/cpp/test/Ice/optional/TestAMD.ice
+++ b/cpp/test/Ice/optional/TestAMD.ice
@@ -263,9 +263,7 @@ interface Initial
     ["cpp:array"] optional(1) DoubleSeq opDoubleSeq(["cpp:array"] optional(2) DoubleSeq p1,
                                                     out ["cpp:array"] optional(3) DoubleSeq p3);
 
-    ["cpp:range"] optional(1) StringSeq opStringSeq(["cpp:range"] optional(2) StringSeq p1,
-                                                    out ["cpp:range"] optional(3) StringSeq p3);
-
+    optional(1) StringSeq opStringSeq(optional(2) StringSeq p1, out optional(3) StringSeq p3);
     ["cpp:array"] optional(1) SmallStructSeq opSmallStructSeq(["cpp:array"] optional(2) SmallStructSeq p1,
                                                               out ["cpp:array"] optional(3) SmallStructSeq p3);
 
@@ -278,8 +276,7 @@ interface Initial
     ["cpp:array"] optional(1) FixedStructList opFixedStructList(["cpp:array"] optional(2) FixedStructList p1,
                                                                 out ["cpp:array"] optional(3) FixedStructList p3);
 
-    ["cpp:range"] optional(1) VarStructSeq opVarStructSeq(["cpp:range"] optional(2) VarStructSeq p1,
-                                                          out ["cpp:range"] optional(3) VarStructSeq p3);
+    optional(1) VarStructSeq opVarStructSeq(optional(2) VarStructSeq p1, out optional(3) VarStructSeq p3);
 
     optional(1) Serializable opSerializable(optional(2) Serializable p1, out optional(3) Serializable p3);
 
diff --git a/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetaData.ice b/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetaData.ice
index 6dbafd6b6f4..b768f376f80 100644
--- a/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetaData.ice
+++ b/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetaData.ice
@@ -42,7 +42,6 @@ interface I
     ["cpp:array"]
     void op3();
 
-    ["cpp:range"]
     void op4();
 }
 
diff --git a/swift/test/Ice/optional/Test.ice b/swift/test/Ice/optional/Test.ice
index 001442a5fac..ca580eb6e23 100644
--- a/swift/test/Ice/optional/Test.ice
+++ b/swift/test/Ice/optional/Test.ice
@@ -272,8 +272,7 @@ interface Initial
     ["cpp:array"] optional(1) DoubleSeq opDoubleSeq(["cpp:array"] optional(2) DoubleSeq p1,
                                                      out ["cpp:array"] optional(3) DoubleSeq p3);
 
-    ["cpp:range"] optional(1) StringSeq opStringSeq(["cpp:range"] optional(2) StringSeq p1,
-                                                    out ["cpp:range"] optional(3) StringSeq p3);
+    optional(1) StringSeq opStringSeq(optional(2) StringSeq p1, out optional(3) StringSeq p3);
 
     ["cpp:array"] optional(1) SmallStructSeq opSmallStructSeq(["cpp:array"] optional(2) SmallStructSeq p1,
                                                               out ["cpp:array"] optional(3) SmallStructSeq p3);
@@ -287,8 +286,7 @@ interface Initial
     ["cpp:array"] optional(1) FixedStructList opFixedStructList(["cpp:array"] optional(2) FixedStructList p1,
                                                                 out ["cpp:array"] optional(3) FixedStructList p3);
 
-    ["cpp:range"] optional(1) VarStructSeq opVarStructSeq(["cpp:range"] optional(2) VarStructSeq p1,
-                                                          out ["cpp:range"] optional(3) VarStructSeq p3);
+    optional(1) VarStructSeq opVarStructSeq(optional(2) VarStructSeq p1, out optional(3) VarStructSeq p3);
 
     optional(1) Serializable opSerializable(optional(2) Serializable p1, out optional(3) Serializable p3);