diff --git a/15_virtual_mem_part3_precomputed_tables/README.md b/15_virtual_mem_part3_precomputed_tables/README.md
index 3fdc2385..989301e0 100644
--- a/15_virtual_mem_part3_precomputed_tables/README.md
+++ b/15_virtual_mem_part3_precomputed_tables/README.md
@@ -2006,7 +2006,7 @@ diff -uNr 14_virtual_mem_part2_mmio_remap/tools/translation_table_tool/arch.rb 1
 +    attr_bitfield(:valid, Valid::OFFSET, Valid::NUMBITS)
 +
 +    def next_level_table_addr=(addr)
-+        addr = addr >> Granule64KiB::SHIFT
++        addr >>= Granule64KiB::SHIFT
 +
 +        self.__next_level_table_addr = addr
 +    end
@@ -2092,7 +2092,7 @@ diff -uNr 14_virtual_mem_part2_mmio_remap/tools/translation_table_tool/arch.rb 1
 +    attr_bitfield(:valid, Valid::OFFSET, Valid::NUMBITS)
 +
 +    def output_addr=(addr)
-+        addr = addr >> Granule64KiB::SHIFT
++        addr >>= Granule64KiB::SHIFT
 +
 +        self.__output_addr = addr
 +    end
diff --git a/15_virtual_mem_part3_precomputed_tables/tools/translation_table_tool/arch.rb b/15_virtual_mem_part3_precomputed_tables/tools/translation_table_tool/arch.rb
index 44b8531e..d8b5d04a 100644
--- a/15_virtual_mem_part3_precomputed_tables/tools/translation_table_tool/arch.rb
+++ b/15_virtual_mem_part3_precomputed_tables/tools/translation_table_tool/arch.rb
@@ -84,7 +84,7 @@ class Stage1TableDescriptor < BitField
     attr_bitfield(:valid, Valid::OFFSET, Valid::NUMBITS)
 
     def next_level_table_addr=(addr)
-        addr = addr >> Granule64KiB::SHIFT
+        addr >>= Granule64KiB::SHIFT
 
         self.__next_level_table_addr = addr
     end
@@ -170,7 +170,7 @@ class Stage1PageDescriptor < BitField
     attr_bitfield(:valid, Valid::OFFSET, Valid::NUMBITS)
 
     def output_addr=(addr)
-        addr = addr >> Granule64KiB::SHIFT
+        addr >>= Granule64KiB::SHIFT
 
         self.__output_addr = addr
     end
diff --git a/16_virtual_mem_part4_higher_half_kernel/tools/translation_table_tool/arch.rb b/16_virtual_mem_part4_higher_half_kernel/tools/translation_table_tool/arch.rb
index 61a6d6ca..053cac19 100644
--- a/16_virtual_mem_part4_higher_half_kernel/tools/translation_table_tool/arch.rb
+++ b/16_virtual_mem_part4_higher_half_kernel/tools/translation_table_tool/arch.rb
@@ -84,7 +84,7 @@ class Stage1TableDescriptor < BitField
     attr_bitfield(:valid, Valid::OFFSET, Valid::NUMBITS)
 
     def next_level_table_addr=(addr)
-        addr = addr >> Granule64KiB::SHIFT
+        addr >>= Granule64KiB::SHIFT
 
         self.__next_level_table_addr = addr
     end
@@ -170,7 +170,7 @@ class Stage1PageDescriptor < BitField
     attr_bitfield(:valid, Valid::OFFSET, Valid::NUMBITS)
 
     def output_addr=(addr)
-        addr = addr >> Granule64KiB::SHIFT
+        addr >>= Granule64KiB::SHIFT
 
         self.__output_addr = addr
     end
diff --git a/17_kernel_symbols/tools/translation_table_tool/arch.rb b/17_kernel_symbols/tools/translation_table_tool/arch.rb
index 61a6d6ca..053cac19 100644
--- a/17_kernel_symbols/tools/translation_table_tool/arch.rb
+++ b/17_kernel_symbols/tools/translation_table_tool/arch.rb
@@ -84,7 +84,7 @@ class Stage1TableDescriptor < BitField
     attr_bitfield(:valid, Valid::OFFSET, Valid::NUMBITS)
 
     def next_level_table_addr=(addr)
-        addr = addr >> Granule64KiB::SHIFT
+        addr >>= Granule64KiB::SHIFT
 
         self.__next_level_table_addr = addr
     end
@@ -170,7 +170,7 @@ class Stage1PageDescriptor < BitField
     attr_bitfield(:valid, Valid::OFFSET, Valid::NUMBITS)
 
     def output_addr=(addr)
-        addr = addr >> Granule64KiB::SHIFT
+        addr >>= Granule64KiB::SHIFT
 
         self.__output_addr = addr
     end
diff --git a/18_backtrace/tools/translation_table_tool/arch.rb b/18_backtrace/tools/translation_table_tool/arch.rb
index 61a6d6ca..053cac19 100644
--- a/18_backtrace/tools/translation_table_tool/arch.rb
+++ b/18_backtrace/tools/translation_table_tool/arch.rb
@@ -84,7 +84,7 @@ class Stage1TableDescriptor < BitField
     attr_bitfield(:valid, Valid::OFFSET, Valid::NUMBITS)
 
     def next_level_table_addr=(addr)
-        addr = addr >> Granule64KiB::SHIFT
+        addr >>= Granule64KiB::SHIFT
 
         self.__next_level_table_addr = addr
     end
@@ -170,7 +170,7 @@ class Stage1PageDescriptor < BitField
     attr_bitfield(:valid, Valid::OFFSET, Valid::NUMBITS)
 
     def output_addr=(addr)
-        addr = addr >> Granule64KiB::SHIFT
+        addr >>= Granule64KiB::SHIFT
 
         self.__output_addr = addr
     end
diff --git a/19_kernel_heap/tools/translation_table_tool/arch.rb b/19_kernel_heap/tools/translation_table_tool/arch.rb
index 61a6d6ca..053cac19 100644
--- a/19_kernel_heap/tools/translation_table_tool/arch.rb
+++ b/19_kernel_heap/tools/translation_table_tool/arch.rb
@@ -84,7 +84,7 @@ class Stage1TableDescriptor < BitField
     attr_bitfield(:valid, Valid::OFFSET, Valid::NUMBITS)
 
     def next_level_table_addr=(addr)
-        addr = addr >> Granule64KiB::SHIFT
+        addr >>= Granule64KiB::SHIFT
 
         self.__next_level_table_addr = addr
     end
@@ -170,7 +170,7 @@ class Stage1PageDescriptor < BitField
     attr_bitfield(:valid, Valid::OFFSET, Valid::NUMBITS)
 
     def output_addr=(addr)
-        addr = addr >> Granule64KiB::SHIFT
+        addr >>= Granule64KiB::SHIFT
 
         self.__output_addr = addr
     end
diff --git a/20_timer_callbacks/tools/translation_table_tool/arch.rb b/20_timer_callbacks/tools/translation_table_tool/arch.rb
index 61a6d6ca..053cac19 100644
--- a/20_timer_callbacks/tools/translation_table_tool/arch.rb
+++ b/20_timer_callbacks/tools/translation_table_tool/arch.rb
@@ -84,7 +84,7 @@ class Stage1TableDescriptor < BitField
     attr_bitfield(:valid, Valid::OFFSET, Valid::NUMBITS)
 
     def next_level_table_addr=(addr)
-        addr = addr >> Granule64KiB::SHIFT
+        addr >>= Granule64KiB::SHIFT
 
         self.__next_level_table_addr = addr
     end
@@ -170,7 +170,7 @@ class Stage1PageDescriptor < BitField
     attr_bitfield(:valid, Valid::OFFSET, Valid::NUMBITS)
 
     def output_addr=(addr)
-        addr = addr >> Granule64KiB::SHIFT
+        addr >>= Granule64KiB::SHIFT
 
         self.__output_addr = addr
     end