diff --git a/Storage/Disk/Controller/MFMDiskController.cpp b/Storage/Disk/Controller/MFMDiskController.cpp
index aec23893b..7264d70bb 100644
--- a/Storage/Disk/Controller/MFMDiskController.cpp
+++ b/Storage/Disk/Controller/MFMDiskController.cpp
@@ -80,7 +80,7 @@ void MFMController::process_input_bit(int value) {
 		break;
 	}
 	latest_token_.byte_value = shifter_.get_byte();
-	posit_event(static_cast<int>(Event::Token));
+	posit_event(int(Event::Token));
 }
 
 void MFMController::write_bit(int bit) {
diff --git a/Storage/Disk/Encodings/MFM/Shifter.cpp b/Storage/Disk/Encodings/MFM/Shifter.cpp
index d17098f85..b68c6f210 100644
--- a/Storage/Disk/Encodings/MFM/Shifter.cpp
+++ b/Storage/Disk/Encodings/MFM/Shifter.cpp
@@ -108,7 +108,7 @@ void Shifter::add_input_bit(int value) {
 }
 
 uint8_t Shifter::get_byte() const {
-	return static_cast<uint8_t>(
+	return uint8_t(
 		((shift_register_ & 0x0001) >> 0) |
 		((shift_register_ & 0x0004) >> 1) |
 		((shift_register_ & 0x0010) >> 2) |