diff --git a/evm/src/cpu/kernel/asm/hash/sha2/message_schedule.asm b/evm/src/cpu/kernel/asm/hash/sha2/message_schedule.asm
index c8bfae7e..d8f0500d 100644
--- a/evm/src/cpu/kernel/asm/hash/sha2/message_schedule.asm
+++ b/evm/src/cpu/kernel/asm/hash/sha2/message_schedule.asm
@@ -59,10 +59,9 @@ gen_message_schedule_from_block_0_loop:
 gen_message_schedule_from_block_0_end:
     // stack: old counter=0, output_addr, block[0], block[1], retdest
     POP
-    PUSH 8
-    // stack: counter=8, output_addr, block[0], block[1], retdest
-    %stack (counter, out, b0, b1) -> (out, counter, b1, b0)
-    // stack: output_addr, counter, block[1], block[0], retdest
+    // stack: output_addr, block[0], block[1], retdest
+    %stack (out, b0, b1) -> (out, 8, b1, b0)
+    // stack: output_addr, counter=8, block[1], block[0], retdest
     %add_const(64)
     // stack: output_addr + 64, counter, block[1], block[0], retdest
     SWAP1
@@ -114,11 +113,7 @@ gen_message_schedule_remaining_loop:
     // stack: output_addr, counter, block[0], block[1], retdest
     DUP1
     // stack: output_addr, output_addr, counter, block[0], block[1], retdest
-    PUSH 2
-    PUSH 4
-    MUL
-    SWAP1
-    SUB
+    %sub_const(8)
     // stack: output_addr - 2*4, output_addr, counter, block[0], block[1], retdest
     %mload_kernel_general_u32
     // stack: x[output_addr - 2*4], output_addr, counter, block[0], block[1], retdest
@@ -128,11 +123,7 @@ gen_message_schedule_remaining_loop:
     // stack: output_addr, sigma_1(x[output_addr - 2*4]), counter, block[0], block[1], retdest
     DUP1
     // stack: output_addr, output_addr, sigma_1(x[output_addr - 2*4]), counter, block[0], block[1], retdest
-    PUSH 7
-    PUSH 4
-    MUL
-    SWAP1
-    SUB
+    %sub_const(28)
     // stack: output_addr - 7*4, output_addr, sigma_1(x[output_addr - 2*4]), counter, block[0], block[1], retdest
     %mload_kernel_general_u32
     // stack: x[output_addr - 7*4], output_addr, sigma_1(x[output_addr - 2*4]), counter, block[0], block[1], retdest
@@ -140,11 +131,7 @@ gen_message_schedule_remaining_loop:
     // stack: output_addr, x[output_addr - 7*4], sigma_1(x[output_addr - 2*4]), counter, block[0], block[1], retdest
     DUP1
     // stack: output_addr, output_addr, x[output_addr - 7*4], sigma_1(x[output_addr - 2*4]), counter, block[0], block[1], retdest
-    PUSH 15
-    PUSH 4
-    MUL
-    SWAP1
-    SUB
+    %sub_const(60)
     // stack: output_addr - 15*4, output_addr, x[output_addr - 7*4], sigma_1(x[output_addr - 2*4]), counter, block[0], block[1], retdest
     %mload_kernel_general_u32
     // stack: x[output_addr - 15*4], output_addr, x[output_addr - 7*4], sigma_1(x[output_addr - 2*4]), counter, block[0], block[1], retdest
@@ -154,11 +141,7 @@ gen_message_schedule_remaining_loop:
     // stack: output_addr, sigma_0(x[output_addr - 15*4]), x[output_addr - 7*4], sigma_1(x[output_addr - 2*4]), counter, block[0], block[1], retdest
     DUP1
     // stack: output_addr, output_addr, sigma_0(x[output_addr - 15*4]), x[output_addr - 7*4], sigma_1(x[output_addr - 2*4]), counter, block[0], block[1], retdest
-    PUSH 16
-    PUSH 4
-    MUL
-    SWAP1
-    SUB
+    %sub_const(64)
     // stack: output_addr - 16*4, output_addr, sigma_0(x[output_addr - 15*4]), x[output_addr - 7*4], sigma_1(x[output_addr - 2*4]), counter, block[0], block[1], retdest
     %mload_kernel_general_u32
     // stack: x[output_addr - 16*4], output_addr, sigma_0(x[output_addr - 15*4]), x[output_addr - 7*4], sigma_1(x[output_addr - 2*4]), counter, block[0], block[1], retdest