diff --git a/src/beacon_root/ctor.eas b/src/beacon_root/ctor.eas
index 5c5a4a1..57d76f2 100644
--- a/src/beacon_root/ctor.eas
+++ b/src/beacon_root/ctor.eas
@@ -1,12 +1,10 @@
-;; Copy and return code.
-push @.end - @.start
-dup1
-push @.start
-push0
-codecopy
-push0
-return
+  ;; Copy and return code.
+  push len(code)     ; [len]
+  dup1               ; [len, len]
+  push @code         ; [codeOffset, len, len]
+  push 0             ; [dest, codeOffset, len, len]
+  codecopy           ; [len]
+  push 0             ; [ptr, len]
+  return             ; []
 
-.start:
-#assemble "main.eas"
-.end:
+#bytes code: assemble("main.eas")
diff --git a/src/consolidations/ctor.eas b/src/consolidations/ctor.eas
index 41aa941..bcb1748 100644
--- a/src/consolidations/ctor.eas
+++ b/src/consolidations/ctor.eas
@@ -1,18 +1,16 @@
-;; Store 0xff..ff as a temporary excess value to avoid requests being queued
-;; before the fork.
-push 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-push0
-sstore
+  ;; Store 0xff..ff as a temporary excess value to avoid requests being queued
+  ;; before the fork.
+  push (1<<256)-1    ; [excess]
+  push 0             ; [slot, excess]
+  sstore             ; []
 
-;; Copy and return code.
-push @.end - @.start
-dup1
-push @.start
-push0
-codecopy
-push0
-return
+  ;; Copy and return code.
+  push len(code)     ; [len]
+  dup1               ; [len, len]
+  push @code         ; [codeOffset, len, len]
+  push 0             ; [dest, codeOffset, len, len]
+  codecopy           ; [len]
+  push 0             ; [ptr, len]
+  return             ; []
 
-.start:
-#assemble "main.eas"
-.end:
+#bytes code: assemble("main.eas")
diff --git a/src/execution_hash/ctor.eas b/src/execution_hash/ctor.eas
index 5c5a4a1..57d76f2 100644
--- a/src/execution_hash/ctor.eas
+++ b/src/execution_hash/ctor.eas
@@ -1,12 +1,10 @@
-;; Copy and return code.
-push @.end - @.start
-dup1
-push @.start
-push0
-codecopy
-push0
-return
+  ;; Copy and return code.
+  push len(code)     ; [len]
+  dup1               ; [len, len]
+  push @code         ; [codeOffset, len, len]
+  push 0             ; [dest, codeOffset, len, len]
+  codecopy           ; [len]
+  push 0             ; [ptr, len]
+  return             ; []
 
-.start:
-#assemble "main.eas"
-.end:
+#bytes code: assemble("main.eas")
diff --git a/src/withdrawals/ctor.eas b/src/withdrawals/ctor.eas
index 41aa941..bcb1748 100644
--- a/src/withdrawals/ctor.eas
+++ b/src/withdrawals/ctor.eas
@@ -1,18 +1,16 @@
-;; Store 0xff..ff as a temporary excess value to avoid requests being queued
-;; before the fork.
-push 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-push0
-sstore
+  ;; Store 0xff..ff as a temporary excess value to avoid requests being queued
+  ;; before the fork.
+  push (1<<256)-1    ; [excess]
+  push 0             ; [slot, excess]
+  sstore             ; []
 
-;; Copy and return code.
-push @.end - @.start
-dup1
-push @.start
-push0
-codecopy
-push0
-return
+  ;; Copy and return code.
+  push len(code)     ; [len]
+  dup1               ; [len, len]
+  push @code         ; [codeOffset, len, len]
+  push 0             ; [dest, codeOffset, len, len]
+  codecopy           ; [len]
+  push 0             ; [ptr, len]
+  return             ; []
 
-.start:
-#assemble "main.eas"
-.end:
+#bytes code: assemble("main.eas")