diff --git a/src/Perl6/Actions.pm b/src/Perl6/Actions.pm
index 538491c4361..6650064e5a8 100644
--- a/src/Perl6/Actions.pm
+++ b/src/Perl6/Actions.pm
@@ -1436,7 +1436,7 @@ method regex_def($/, $key?) {
 
         # Create code object and install it provided it has a name.
         if ($name) {
-            my $code := create_code_object(PAST::Val.new(:value($past)), 'Regex', 0);
+            my $code := block_closure(blockref($past), 'Regex', 0);
             our @PACKAGE;
             unless +@PACKAGE {
                 $/.CURSOR.panic("Can not declare named " ~ ~$<sym> ~ " outside of a package");
@@ -1446,7 +1446,7 @@ method regex_def($/, $key?) {
             install_method($/, $code, $name, %table);
         }
         else {
-            $past := create_code_object($past, 'Regex', 0);
+            $past := block_closure($past, 'Regex', 0);
         }
     }
     make $past;
diff --git a/src/Perl6/Compiler/Role.pm b/src/Perl6/Compiler/Role.pm
index 6e6e4b1dd26..9d2036255d1 100644
--- a/src/Perl6/Compiler/Role.pm
+++ b/src/Perl6/Compiler/Role.pm
@@ -68,11 +68,7 @@ method finish($block) {
             :pasttype('callmethod'),
             :name('add_method'),
             $meta_reg, $obj_reg, ~$_, 
-            PAST::Op.new(
-                :pasttype('callmethod'),
-                :name('clone'),
-                %methods{~$_}<code_ref>
-            )
+            %methods{~$_}<code_ref>
         ));
     }