@@ -41,11 +41,11 @@
 # define OBJC_M68K_REG(reg)
 #endif
 
 /* This always needs to be the first thing in the file. */
 int
-_start()
+_start(void)
 {
 	return -1;
 }
 
 #ifdef OF_AMIGAOS_M68K
@@ -292,13 +292,13 @@
 	if (base->parent != NULL) {
 		struct ObjFWRTBase *parent;
 
 #ifdef OF_AMIGAOS_M68K
 		if (base->initialized)
-			for (size_t i = 1; i <= (size_t)_EH_FRAME_BEGINS__; i++)
-				libc.__deregister_frame_info(
-				    (&_EH_FRAME_BEGINS__)[i]);
+			for (void *const *frame = _EH_FRAME_BEGINS__;
+			    *frame != NULL;)
+				libc.__deregister_frame_info(*frame++);
 #endif
 
 		parent = base->parent;
 
 		FreeMem(base->dataSeg - DATA_OFFSET, getDataSize());
@@ -343,16 +343,13 @@
 		return true;
 
 	memcpy(&libc, libc_, sizeof(libc));
 
 #ifdef OF_AMIGAOS_M68K
-	if ((size_t)_EH_FRAME_BEGINS__ != (size_t)_EH_FRAME_OBJECTS__)
-		return false;
-
-	for (size_t i = 1; i <= (size_t)_EH_FRAME_BEGINS__; i++)
-		libc.__register_frame_info((&_EH_FRAME_BEGINS__)[i],
-		    (&_EH_FRAME_OBJECTS__)[i]);
+	for (void *const *frame = _EH_FRAME_OBJECTS__,
+	    **object = _EH_FRAME_OBJECTS__; *frame != NULL;)
+		libc.__register_frame_info(*frame++, *object++);
 
 	iter0 = &__CTOR_LIST__[1];
 #elif defined(OF_MORPHOS)
 	__asm__ (
 	    "lis	%0, __EH_FRAME_BEGIN__@ha\n\t"