diff --git a/Zend/zend_enum.c b/Zend/zend_enum.c
index ecebe7a5d51b..81b1ada17ee9 100644
--- a/Zend/zend_enum.c
+++ b/Zend/zend_enum.c
@@ -143,8 +143,6 @@ static int zend_implement_unit_enum(zend_class_entry *interface, zend_class_entr
 	zend_error_noreturn(E_ERROR, "Non-enum class %s cannot implement interface %s",
 		ZSTR_VAL(class_type->name),
 		ZSTR_VAL(interface->name));
-
-	return FAILURE;
 }
 
 static int zend_implement_backed_enum(zend_class_entry *interface, zend_class_entry *class_type)
@@ -153,14 +151,12 @@ static int zend_implement_backed_enum(zend_class_entry *interface, zend_class_en
 		zend_error_noreturn(E_ERROR, "Non-enum class %s cannot implement interface %s",
 			ZSTR_VAL(class_type->name),
 			ZSTR_VAL(interface->name));
-		return FAILURE;
 	}
 
 	if (class_type->enum_backing_type == IS_UNDEF) {
 		zend_error_noreturn(E_ERROR, "Non-backed enum %s cannot implement interface %s",
 			ZSTR_VAL(class_type->name),
 			ZSTR_VAL(interface->name));
-		return FAILURE;
 	}
 
 	return SUCCESS;
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index 1b8297881d60..deb24b6397eb 100644
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -83,7 +83,6 @@ static int zend_implement_throwable(zend_class_entry *interface, zend_class_entr
 		zend_get_object_type_uc(class_type),
 		ZSTR_VAL(class_type->name),
 		ZSTR_VAL(interface->name));
-	return FAILURE;
 }
 /* }}} */
 
diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c
index 49169dfca234..1145d40d9321 100644
--- a/Zend/zend_interfaces.c
+++ b/Zend/zend_interfaces.c
@@ -279,7 +279,6 @@ static int zend_implement_traversable(zend_class_entry *interface, zend_class_en
 		ZSTR_VAL(zend_ce_traversable->name),
 		ZSTR_VAL(zend_ce_iterator->name),
 		ZSTR_VAL(zend_ce_aggregate->name));
-	return FAILURE;
 }
 /* }}} */
 
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index e06287895d15..2b2a54634912 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -232,8 +232,6 @@ ZEND_API HashTable *zend_std_get_debug_info(zend_object *object, int *is_temp) /
 	}
 
 	zend_error_noreturn(E_ERROR, ZEND_DEBUGINFO_FUNC_NAME "() must return an array");
-
-	return NULL; /* Compilers are dumb and don't understand that noreturn means that the function does NOT need a return value... */
 }
 /* }}} */
 
diff --git a/ext/standard/io_poll.c b/ext/standard/io_poll.c
index f57813874d52..4dbf29631028 100644
--- a/ext/standard/io_poll.c
+++ b/ext/standard/io_poll.c
@@ -228,7 +228,6 @@ static int php_stream_poll_handle_implement_interface(zend_class_entry *interfac
 {
 	if (implementor->type == ZEND_USER_CLASS) {
 		zend_error_noreturn(E_ERROR, "Io\\Poll\\Handle cannot be implemented by user classes");
-		return FAILURE;
 	}
 
 	return SUCCESS;
diff --git a/sapi/fpm/fpm/fpm_env.c b/sapi/fpm/fpm/fpm_env.c
index 1f95fcc469a4..5a271629d9cc 100644
--- a/sapi/fpm/fpm/fpm_env.c
+++ b/sapi/fpm/fpm/fpm_env.c
@@ -91,8 +91,9 @@ void unsetenv(const char *name) /* {{{ */
 		int del = 0;
 
 		while(environ[ct] != NULL) {
-			if (nvmatch(name, environ[ct]) != 0) del=ct; /* <--- WTF?! */
-			{ ct++; } /* <--- WTF?! */
+			if (nvmatch(name, environ[ct]) != 0)
+				del = ct;
+			ct++;
 		}
 		/* isn't needed free here?? */
 		environ[del] = environ[ct-1];