diff --git a/kaem.arm b/kaem.arm
index 4357c62b..4e973a1f 100644
--- a/kaem.arm
+++ b/kaem.arm
@@ -19,7 +19,6 @@
 # Usage:
 # kaem --verbose --strict
 
-cc_cpu=arm
 mes_cpu=arm
 stage0_cpu=armv7l
 kaem --verbose --strict
diff --git a/kaem.run b/kaem.run
index cdbae3aa..ee4de280 100644
--- a/kaem.run
+++ b/kaem.run
@@ -19,7 +19,6 @@
 # Usage:
 # kaem --verbose --strict
 
-cc_cpu=${mes_cpu:-i386}
 mes_cpu=${mes_cpu:-x86}
 stage0_cpu=${stage0_cpu:-x86}
 
@@ -28,7 +27,7 @@ mkdir -p m2
 M2-Planet                                       \
     --debug                                     \
     --architecture ${stage0_cpu}                \
-    -D __${cc_cpu}__=1                          \
+    -D __${mes_cpu}__=1                         \
     -D __linux__=1                              \
     -f include/mes/config.h                     \
     -f include/mes/lib-mini.h                   \
diff --git a/kaem.x86 b/kaem.x86
index caea7f87..60ab6e6b 100644
--- a/kaem.x86
+++ b/kaem.x86
@@ -19,7 +19,6 @@
 # Usage:
 # kaem --verbose --strict
 
-cc_cpu=i386
 mes_cpu=x86
 stage0_cpu=x86
 kaem --verbose --strict
diff --git a/kaem.x86_64 b/kaem.x86_64
index b20aecc3..e6329ba8 100644
--- a/kaem.x86_64
+++ b/kaem.x86_64
@@ -19,7 +19,6 @@
 # Usage:
 # kaem --verbose --strict
 
-cc_cpu=x86_64
 mes_cpu=x86_64
 stage0_cpu=amd64
 kaem --verbose --strict
diff --git a/src/posix.c b/src/posix.c
index b619ac14..75201ca9 100644
--- a/src/posix.c
+++ b/src/posix.c
@@ -373,16 +373,15 @@ waitpid_ (struct scm *pid, struct scm *options)
   return cons (make_number (child), make_number (status));
 }
 
-#if __x86_64__
-/* Nanoseconds on 64-bit systems with POSIX timers.  */
 #if __M2__
-#define TIME_UNITS_PER_SECOND 1000000000
-#else
-#define TIME_UNITS_PER_SECOND 1000000000U
-#endif
-#else
 /* Milliseconds for everyone else.  */
 #define TIME_UNITS_PER_SECOND 1000
+#elif __x86_64__
+/* Nanoseconds on 64-bit systems with POSIX timers.  */
+#define TIME_UNITS_PER_SECOND 1000000000U
+#else
+/* Milliseconds for everyone else.  */
+#define TIME_UNITS_PER_SECOND 1000U
 #endif
 
 struct scm *