diff --git a/src/core.c/Iterable.pm6 b/src/core.c/Iterable.pm6
index faa53c7b783..2e23e2f31fe 100644
--- a/src/core.c/Iterable.pm6
+++ b/src/core.c/Iterable.pm6
@@ -80,38 +80,11 @@ my role Iterable {
 
     method lazy-if($flag) { $flag ?? self.lazy !! self }
 
-    my class Lazy does Iterator {
-        has $!iterable;
-        has $!iterator;
-
-        method new(\iterable) {
-            my \iter := nqp::create(self);
-            nqp::bindattr(iter,self,'$!iterable',iterable);
-            nqp::bindattr(iter,self,'$!iterator',nqp::null);
-            iter
-        }
-
-        method pull-one() is raw {
-            nqp::ifnull(
-              $!iterator,
-              $!iterator := $!iterable.iterator
-            ).pull-one
-        }
-
-        method push-exactly(\target, int $n) {
-            nqp::ifnull(
-              $!iterator,
-              $!iterator := $!iterable.iterator
-            ).push-exactly(target, $n);
-        }
-
-        method is-lazy(--> True) { }
-    }
     method lazy() {
         # Return a Seq with an iterator wrapping this Iterable, claiming to
         # be lazy, and implicitly preventing working ahead (by hiding any
         # push-at-least-n of the source iterator).
-        Seq.new(Lazy.new(self))
+        Seq.new(Rakudo::Iterator.Lazy(self))
     }
 
     method hyper(Int(Cool) :$batch = 64, Int(Cool) :$degree = 4) {
diff --git a/src/core.c/Rakudo/Iterator.pm6 b/src/core.c/Rakudo/Iterator.pm6
index 4f21f01a22a..37313e91a52 100644
--- a/src/core.c/Rakudo/Iterator.pm6
+++ b/src/core.c/Rakudo/Iterator.pm6
@@ -2155,6 +2155,39 @@ class Rakudo::Iterator {
         )
     }
 
+    # Return an iterator that is always lazy, by wrapping it inside another
+    # iterator that indicates to be lazy.  Does not actually call the
+    # iterator until it is really  necessary, preventing any unnecessary
+    # work or external resource usage.
+    my class Lazy does Iterator {
+        has $!iterable;
+        has $!iterator;
+
+        method new(\iterable) {
+            my \iter := nqp::create(self);
+            nqp::bindattr(iter,self,'$!iterable',iterable);
+            nqp::bindattr(iter,self,'$!iterator',nqp::null);
+            iter
+        }
+
+        method pull-one() is raw {
+            nqp::ifnull(
+              $!iterator,
+              $!iterator := $!iterable.iterator
+            ).pull-one
+        }
+
+        method push-exactly(\target, int $n) {
+            nqp::ifnull(
+              $!iterator,
+              $!iterator := $!iterable.iterator
+            ).push-exactly(target, $n);
+        }
+
+        method is-lazy(--> True) { }
+    }
+    method Lazy(\iterable) { Lazy.new(iterable) }
+
     # Return an iterator given a List and an iterator that generates
     # an IterationBuffer of indexes for each pull.  Each value is
     # is a List with the mapped elements.