:: commit 35ade5f5571fbd9cefaad4a58a09883cda3da18d

diff --git a/common/lib/acpi.c b/common/lib/acpi.c
index 53bb87c8..26037d48 100644
--- a/common/lib/acpi.c
+++ b/common/lib/acpi.c
@@ -436,7 +436,7 @@ void efi_map_runtime_entries(void) {
         }
 
         uint64_t base = entry->PhysicalStart;
-        uint64_t length = CHECKED_MUL(entry->NumberOfPages, (uint64_t)4096, continue);
+        uint64_t length = CHECKED_MUL(entry->NumberOfPages, 4096, continue);
 
         memmap_alloc_range(base, length, MEMMAP_RESERVED_MAPPED, 0, true, false, true);
     }
diff --git a/common/lib/image.c b/common/lib/image.c
index f9f43880..64c56456 100644
--- a/common/lib/image.c
+++ b/common/lib/image.c
@@ -56,7 +56,7 @@ struct image *image_open(struct file_handle *file) {
 
     image->x_size = x;
     image->y_size = y;
-    image->pitch = (int)CHECKED_MUL((size_t)x, (size_t)4,
+    image->pitch = (int)CHECKED_MUL((size_t)x, 4,
         ({ pmm_free(image, sizeof(struct image)); return NULL; }));
     image->bpp = 32;
     image->img_width = x;
diff --git a/common/lib/misc.s2.c b/common/lib/misc.s2.c
index d75d22cc..4cc1c431 100644
--- a/common/lib/misc.s2.c
+++ b/common/lib/misc.s2.c
@@ -38,12 +38,12 @@ uint64_t strtoui(const char *s, const char **end, int base) {
                 *end = &s[i];
             break;
         }
-        uint64_t mul_result = CHECKED_MUL(n, (uint64_t)base, ({
+        uint64_t mul_result = CHECKED_MUL(n, base, ({
             if (end != NULL)
                 *end = &s[i];
             return UINT64_MAX;
         }));
-        n = CHECKED_ADD(mul_result, (uint64_t)d, ({
+        n = CHECKED_ADD(mul_result, d, ({
             if (end != NULL)
                 *end = &s[i];
             return UINT64_MAX;
diff --git a/common/lib/part.s2.c b/common/lib/part.s2.c
index be47d32c..4095a996 100644
--- a/common/lib/part.s2.c
+++ b/common/lib/part.s2.c
@@ -72,7 +72,7 @@ bool volume_read(struct volume *volume, void *buffer, uint64_t loc, uint64_t cou
 
     if (volume->sect_count != (uint64_t)-1) {
         // sect_count is always in 512-byte sectors for both whole disks and partitions
-        uint64_t part_size = CHECKED_MUL(volume->sect_count, (uint64_t)512, return false);
+        uint64_t part_size = CHECKED_MUL(volume->sect_count, 512, return false);
         if (loc >= part_size || count > part_size - loc) {
             return false;
         }
@@ -211,7 +211,7 @@ static int gpt_get_part(struct volume *ret, struct volume *volume, int partition
         return INVALID_TABLE;
     }
 
-    uint64_t entry_offset = CHECKED_MUL((uint64_t)header.partition_entry_lba, (uint64_t)lb_size, return INVALID_TABLE);
+    uint64_t entry_offset = CHECKED_MUL(header.partition_entry_lba, lb_size, return INVALID_TABLE);
     // Use actual entry size from header for offset calculation
     uint64_t partition_offset = (uint64_t)partition * entry_size;
     entry_offset = CHECKED_ADD(entry_offset, partition_offset, return INVALID_TABLE);
@@ -407,8 +407,8 @@ static int mbr_get_logical_part(struct volume *ret, struct volume *extended_part
 
     // Check for overflow in first_sect calculation
     uint64_t first_sect_64 = CHECKED_ADD(extended_part->first_sect, ebr_sector, return NO_PARTITION);
-    first_sect_64 = CHECKED_ADD(first_sect_64, (uint64_t)entry.first_sect, return NO_PARTITION);
-    (void)CHECKED_ADD(first_sect_64, (uint64_t)entry.sect_count, return NO_PARTITION);
+    first_sect_64 = CHECKED_ADD(first_sect_64, entry.first_sect, return NO_PARTITION);
+    (void)CHECKED_ADD(first_sect_64, entry.sect_count, return NO_PARTITION);
 
 #if defined (UEFI)
     ret->efi_handle  = extended_part->efi_handle;
diff --git a/common/mm/pmm.s2.c b/common/mm/pmm.s2.c
index d8f224a4..70e37201 100644
--- a/common/mm/pmm.s2.c
+++ b/common/mm/pmm.s2.c
@@ -385,7 +385,7 @@ void init_memmap(void) {
         }
 
         uint64_t base = entry->PhysicalStart;
-        uint64_t length = CHECKED_MUL(entry->NumberOfPages, (uint64_t)4096, continue);
+        uint64_t length = CHECKED_MUL(entry->NumberOfPages, 4096, continue);
 
         if (memmap_entries == memmap_max_entries) {
             panic(false, "Memory map exhausted.");
@@ -482,7 +482,7 @@ static void pmm_reclaim_uefi_mem(struct memmap_entry *m, size_t *_count, bool ra
             uint64_t base = r->base;
             uint64_t top = CHECKED_ADD(base, r->length, continue);
             uint64_t efi_base = entry->PhysicalStart;
-            uint64_t efi_size = CHECKED_MUL(entry->NumberOfPages, (uint64_t)4096, continue);
+            uint64_t efi_size = CHECKED_MUL(entry->NumberOfPages, 4096, continue);
 
             if (efi_base < base) {
                 if (efi_size <= base - efi_base)