diff --git a/Zend/zend.c b/Zend/zend.c
index d2be69a757690..49e18f1a777c7 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -157,7 +157,7 @@ static ZEND_INI_MH(OnUpdateScriptEncoding) /* {{{ */
 
 static ZEND_INI_MH(OnUpdateAssertions) /* {{{ */
 {
-	zend_long *p = (zend_long *) ZEND_INI_GET_ADDR();
+	zend_long *p = ZEND_INI_GET_ADDR();
 
 	zend_long val = zend_ini_parse_quantity_warn(new_value, entry->name);
 
diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
index 8d26cd65579df..5e3a12e455379 100644
--- a/Zend/zend_ini.c
+++ b/Zend/zend_ini.c
@@ -963,7 +963,7 @@ ZEND_INI_DISP(display_link_numbers) /* {{{ */
 /* Standard message handlers */
 ZEND_API ZEND_INI_MH(OnUpdateBool) /* {{{ */
 {
-	bool *p = (bool *) ZEND_INI_GET_ADDR();
+	bool *p = ZEND_INI_GET_ADDR();
 	*p = zend_ini_parse_bool(new_value);
 	return SUCCESS;
 }
@@ -971,7 +971,7 @@ ZEND_API ZEND_INI_MH(OnUpdateBool) /* {{{ */
 
 ZEND_API ZEND_INI_MH(OnUpdateLong) /* {{{ */
 {
-	zend_long *p = (zend_long *) ZEND_INI_GET_ADDR();
+	zend_long *p = ZEND_INI_GET_ADDR();
 	*p = zend_ini_parse_quantity_warn(new_value, entry->name);
 	return SUCCESS;
 }
@@ -984,7 +984,7 @@ ZEND_API ZEND_INI_MH(OnUpdateLongGEZero) /* {{{ */
 		return FAILURE;
 	}
 
-	zend_long *p = (zend_long *) ZEND_INI_GET_ADDR();
+	zend_long *p = ZEND_INI_GET_ADDR();
 	*p = tmp;
 
 	return SUCCESS;
@@ -993,7 +993,7 @@ ZEND_API ZEND_INI_MH(OnUpdateLongGEZero) /* {{{ */
 
 ZEND_API ZEND_INI_MH(OnUpdateReal) /* {{{ */
 {
-	double *p = (double *) ZEND_INI_GET_ADDR();
+	double *p = ZEND_INI_GET_ADDR();
 	*p = zend_strtod(ZSTR_VAL(new_value), NULL);
 	return SUCCESS;
 }
@@ -1001,7 +1001,7 @@ ZEND_API ZEND_INI_MH(OnUpdateReal) /* {{{ */
 
 ZEND_API ZEND_INI_MH(OnUpdateString) /* {{{ */
 {
-	char **p = (char **) ZEND_INI_GET_ADDR();
+	char **p = ZEND_INI_GET_ADDR();
 	*p = new_value ? ZSTR_VAL(new_value) : NULL;
 	return SUCCESS;
 }
@@ -1013,7 +1013,7 @@ ZEND_API ZEND_INI_MH(OnUpdateStringUnempty) /* {{{ */
 		return FAILURE;
 	}
 
-	char **p = (char **) ZEND_INI_GET_ADDR();
+	char **p = ZEND_INI_GET_ADDR();
 	*p = new_value ? ZSTR_VAL(new_value) : NULL;
 	return SUCCESS;
 }
@@ -1021,7 +1021,7 @@ ZEND_API ZEND_INI_MH(OnUpdateStringUnempty) /* {{{ */
 
 ZEND_API ZEND_INI_MH(OnUpdateStr) /* {{{ */
 {
-	zend_string **p = (zend_string **) ZEND_INI_GET_ADDR();
+	zend_string **p = ZEND_INI_GET_ADDR();
 	*p = new_value;
 	return SUCCESS;
 }
@@ -1033,7 +1033,7 @@ ZEND_API ZEND_INI_MH(OnUpdateStrNotEmpty) /* {{{ */
 		return FAILURE;
 	}
 
-	zend_string **p = (zend_string **) ZEND_INI_GET_ADDR();
+	zend_string **p = ZEND_INI_GET_ADDR();
 	*p = new_value;
 	return SUCCESS;
 }
diff --git a/Zend/zend_ini.h b/Zend/zend_ini.h
index 5a7377f1181d8..4bb90d6ef0a74 100644
--- a/Zend/zend_ini.h
+++ b/Zend/zend_ini.h
@@ -257,6 +257,6 @@ typedef struct _zend_ini_parser_param {
 # define ZEND_INI_GET_BASE() ((char *) ts_resource(*((int *) mh_arg2)))
 #endif
 
-#define ZEND_INI_GET_ADDR() (ZEND_INI_GET_BASE() + (size_t) mh_arg1)
+#define ZEND_INI_GET_ADDR() ((void*)(ZEND_INI_GET_BASE() + (size_t) mh_arg1))
 
 #endif /* ZEND_INI_H */
diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c
index df2b96e68a715..a77b5338e58ec 100644
--- a/ext/bcmath/bcmath.c
+++ b/ext/bcmath/bcmath.c
@@ -73,7 +73,7 @@ ZEND_GET_MODULE(bcmath)
 
 ZEND_INI_MH(OnUpdateScale)
 {
-	int *p;
+	int *p = ZEND_INI_GET_ADDR();
 	zend_long tmp;
 
 	tmp = zend_ini_parse_quantity_warn(new_value, entry->name);
@@ -81,7 +81,6 @@ ZEND_INI_MH(OnUpdateScale)
 		return FAILURE;
 	}
 
-	p = (int *) ZEND_INI_GET_ADDR();
 	*p = (int) tmp;
 
 	return SUCCESS;
diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c
index 00001e9985b7f..441b26ae088de 100644
--- a/ext/intl/php_intl.c
+++ b/ext/intl/php_intl.c
@@ -115,7 +115,7 @@ char* canonicalize_locale_string(const char* locale) {
 
 static PHP_INI_MH(OnUpdateErrorLevel)
 {
-	zend_long *p = (zend_long *) ZEND_INI_GET_ADDR();
+	zend_long *p = ZEND_INI_GET_ADDR();
 	*p = zend_ini_parse_quantity_warn(new_value, entry->name);
 	if (*p) {
 		php_error_docref("session.configuration", E_DEPRECATED,
diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
index a2569e07f14c9..befbb621f4c25 100644
--- a/ext/opcache/zend_accelerator_module.c
+++ b/ext/opcache/zend_accelerator_module.c
@@ -87,7 +87,7 @@ static ZEND_INI_MH(OnUpdateMemoryConsumption)
 		return FAILURE;
 	}
 
-	zend_long *p = (zend_long *) ZEND_INI_GET_ADDR();
+	zend_long *p = ZEND_INI_GET_ADDR();
 	zend_long memsize = atoi(ZSTR_VAL(new_value));
 	/* sanity check we must use at least 8 MB */
 	if (memsize < 8) {
@@ -104,7 +104,7 @@ static ZEND_INI_MH(OnUpdateMemoryConsumption)
 
 static ZEND_INI_MH(OnUpdateInternedStringsBuffer)
 {
-	zend_long *p = (zend_long *) ZEND_INI_GET_ADDR();
+	zend_long *p = ZEND_INI_GET_ADDR();
 	zend_long size = zend_ini_parse_quantity_warn(new_value, entry->name);
 
 	if (size < 0) {
@@ -123,7 +123,7 @@ static ZEND_INI_MH(OnUpdateInternedStringsBuffer)
 
 static ZEND_INI_MH(OnUpdateMaxAcceleratedFiles)
 {
-	zend_long *p = (zend_long *) ZEND_INI_GET_ADDR();
+	zend_long *p = ZEND_INI_GET_ADDR();
 	zend_long size = atoi(ZSTR_VAL(new_value));
 	/* sanity check we must use a value between MIN_ACCEL_FILES and MAX_ACCEL_FILES */
 	if (size < MIN_ACCEL_FILES) {
@@ -140,7 +140,7 @@ static ZEND_INI_MH(OnUpdateMaxAcceleratedFiles)
 
 static ZEND_INI_MH(OnUpdateMaxWastedPercentage)
 {
-	double *p = (double *) ZEND_INI_GET_ADDR();
+	double *p = ZEND_INI_GET_ADDR();
 	zend_long percentage = atoi(ZSTR_VAL(new_value));
 
 	if (percentage <= 0 || percentage > 50) {
@@ -159,7 +159,7 @@ static ZEND_INI_MH(OnEnable)
 		return OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
 	} else {
 		/* It may be only temporarily disabled */
-		bool *p = (bool *) ZEND_INI_GET_ADDR();
+		bool *p = ZEND_INI_GET_ADDR();
 		if (zend_ini_parse_bool(new_value)) {
 			if (*p) {
 				/* Do not warn if OPcache is enabled, as the update would be a noop anyways. */
@@ -206,7 +206,7 @@ static ZEND_INI_MH(OnUpdateJit)
 
 static ZEND_INI_MH(OnUpdateJitDebug)
 {
-	zend_long *p = (zend_long *) ZEND_INI_GET_ADDR();
+	zend_long *p = ZEND_INI_GET_ADDR();
 	zend_long val = zend_ini_parse_quantity_warn(new_value, entry->name);
 
 	if (zend_jit_debug_config(*p, val, stage) == SUCCESS) {
@@ -220,7 +220,7 @@ static ZEND_INI_MH(OnUpdateCounter)
 {
 	zend_long val = zend_ini_parse_quantity_warn(new_value, entry->name);
 	if (val >= 0 && val < 256) {
-		zend_long *p = (zend_long *) ZEND_INI_GET_ADDR();
+		zend_long *p = ZEND_INI_GET_ADDR();
 		*p = val;
 		return SUCCESS;
 	}
@@ -232,7 +232,7 @@ static ZEND_INI_MH(OnUpdateUnrollC)
 {
 	zend_long val = zend_ini_parse_quantity_warn(new_value, entry->name);
 	if (val > 0 && val < ZEND_JIT_TRACE_MAX_CALL_DEPTH) {
-		zend_long *p = (zend_long *) ZEND_INI_GET_ADDR();
+		zend_long *p = ZEND_INI_GET_ADDR();
 		*p = val;
 		return SUCCESS;
 	}
@@ -245,7 +245,7 @@ static ZEND_INI_MH(OnUpdateUnrollR)
 {
 	zend_long val = zend_ini_parse_quantity_warn(new_value, entry->name);
 	if (val >= 0 && val < ZEND_JIT_TRACE_MAX_RET_DEPTH) {
-		zend_long *p = (zend_long *) ZEND_INI_GET_ADDR();
+		zend_long *p = ZEND_INI_GET_ADDR();
 		*p = val;
 		return SUCCESS;
 	}
@@ -258,7 +258,7 @@ static ZEND_INI_MH(OnUpdateUnrollL)
 {
 	zend_long val = zend_ini_parse_quantity_warn(new_value, entry->name);
 	if (val > 0 && val < ZEND_JIT_TRACE_MAX_LOOPS_UNROLL) {
-		zend_long *p = (zend_long *) ZEND_INI_GET_ADDR();
+		zend_long *p = ZEND_INI_GET_ADDR();
 		*p = val;
 		return SUCCESS;
 	}
@@ -271,7 +271,7 @@ static ZEND_INI_MH(OnUpdateMaxTraceLength)
 {
 	zend_long val = zend_ini_parse_quantity_warn(new_value, entry->name);
 	if (val > 3 && val <= ZEND_JIT_TRACE_MAX_LENGTH) {
-		zend_long *p = (zend_long *) ZEND_INI_GET_ADDR();
+		zend_long *p = ZEND_INI_GET_ADDR();
 		*p = val;
 		return SUCCESS;
 	}
diff --git a/ext/session/session.c b/ext/session/session.c
index c2778b85ff86c..1f0c3c7213edd 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -812,7 +812,7 @@ static PHP_INI_MH(OnUpdateSessionGcProbability)
         return FAILURE;
     }
 
-    zend_long *p = (zend_long *) ZEND_INI_GET_ADDR();
+    zend_long *p = ZEND_INI_GET_ADDR();
     *p = tmp;
 
     return SUCCESS;
@@ -830,7 +830,7 @@ static PHP_INI_MH(OnUpdateSessionDivisor)
         return FAILURE;
     }
 
-    zend_long *p = (zend_long *) ZEND_INI_GET_ADDR();
+    zend_long *p = ZEND_INI_GET_ADDR();
     *p = tmp;
 
     return SUCCESS;
@@ -859,7 +859,7 @@ static PHP_INI_MH(OnUpdateUseOnlyCookies)
 {
 	SESSION_CHECK_ACTIVE_STATE;
 	SESSION_CHECK_OUTPUT_STATE;
-	bool *p = (bool *) ZEND_INI_GET_ADDR();
+	bool *p = ZEND_INI_GET_ADDR();
 	*p = zend_ini_parse_bool(new_value);
 	if (!*p) {
 		php_error_docref("session.configuration", E_DEPRECATED, "Disabling session.use_only_cookies INI setting is deprecated");
@@ -871,7 +871,7 @@ static PHP_INI_MH(OnUpdateUseTransSid)
 {
 	SESSION_CHECK_ACTIVE_STATE;
 	SESSION_CHECK_OUTPUT_STATE;
-	bool *p = (bool *) ZEND_INI_GET_ADDR();
+	bool *p = ZEND_INI_GET_ADDR();
 	*p = zend_ini_parse_bool(new_value);
 	if (*p) {
 		php_error_docref("session.configuration", E_DEPRECATED, "Enabling session.use_trans_sid INI setting is deprecated");
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index 471b2d622d98a..6c850a27cf0f7 100644
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -349,7 +349,7 @@ ZEND_GET_MODULE(soap)
 
 ZEND_INI_MH(OnUpdateCacheMode)
 {
-	char *p = (char *) ZEND_INI_GET_ADDR();
+	char *p = ZEND_INI_GET_ADDR();
 	*p = (char)atoi(ZSTR_VAL(new_value));
 	return SUCCESS;
 }
diff --git a/ext/standard/assert.c b/ext/standard/assert.c
index 258447576e1f4..a29d022b4ac47 100644
--- a/ext/standard/assert.c
+++ b/ext/standard/assert.c
@@ -79,7 +79,7 @@ static PHP_INI_MH(OnChangeCallback) /* {{{ */
 
 static PHP_INI_MH(OnUpdateActiveBool)
 {
-	bool *p = (bool *) ZEND_INI_GET_ADDR();
+	bool *p = ZEND_INI_GET_ADDR();
 	*p = zend_ini_parse_bool(new_value);
 	if (php_must_emit_ini_deprecation(stage) && !*p) {
 		php_error_docref(NULL, E_DEPRECATED, "assert.active INI setting is deprecated");
@@ -89,7 +89,7 @@ static PHP_INI_MH(OnUpdateActiveBool)
 
 static PHP_INI_MH(OnUpdateBailBool)
 {
-	bool *p = (bool *) ZEND_INI_GET_ADDR();
+	bool *p = ZEND_INI_GET_ADDR();
 	*p = zend_ini_parse_bool(new_value);
 	if (php_must_emit_ini_deprecation(stage) && *p) {
 		php_error_docref(NULL, E_DEPRECATED, "assert.bail INI setting is deprecated");
@@ -99,7 +99,7 @@ static PHP_INI_MH(OnUpdateBailBool)
 
 static PHP_INI_MH(OnUpdateExceptionBool)
 {
-	bool *p = (bool *) ZEND_INI_GET_ADDR();
+	bool *p = ZEND_INI_GET_ADDR();
 	*p = zend_ini_parse_bool(new_value);
 	if (php_must_emit_ini_deprecation(stage) && !*p) {
 		php_error_docref(NULL, E_DEPRECATED, "assert.exception INI setting is deprecated");
@@ -110,7 +110,7 @@ static PHP_INI_MH(OnUpdateExceptionBool)
 
 static PHP_INI_MH(OnUpdateWarningBool)
 {
-	bool *p = (bool *) ZEND_INI_GET_ADDR();
+	bool *p = ZEND_INI_GET_ADDR();
 	*p = zend_ini_parse_bool(new_value);
 	if (php_must_emit_ini_deprecation(stage) && !*p) {
 		php_error_docref(NULL, E_DEPRECATED, "assert.warning INI setting is deprecated");
diff --git a/ext/zend_test/observer.c b/ext/zend_test/observer.c
index 348996b7ac132..85c7d82da0e84 100644
--- a/ext/zend_test/observer.c
+++ b/ext/zend_test/observer.c
@@ -326,7 +326,7 @@ static void zend_test_execute_internal(zend_execute_data *execute_data, zval *re
 
 static ZEND_INI_MH(zend_test_observer_OnUpdateCommaList)
 {
-	zend_array **p = (zend_array **) ZEND_INI_GET_ADDR();
+	zend_array **p = ZEND_INI_GET_ADDR();
 	zend_string *funcname;
 	zend_function *func;
 	if (!ZT_G(observer_enabled)) {
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 68c5572931b66..4a6bb81899c91 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -1293,7 +1293,7 @@ static PHP_INI_MH(OnUpdate_zlib_output_compression)
 		}
 	}
 
-	zend_long *p = (zend_long *) ZEND_INI_GET_ADDR();
+	zend_long *p = ZEND_INI_GET_ADDR();
 	*p = int_value;
 
 	ZLIBG(output_compression) = ZLIBG(output_compression_default);
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index f1ab7312c46ee..b6f32ce309dc4 100644
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -72,7 +72,7 @@ Allows any change to open_basedir setting in during Startup and Shutdown events,
 or a tightening during activation/runtime/deactivation */
 PHPAPI ZEND_INI_MH(OnUpdateBaseDir)
 {
-	char **p = (char **) ZEND_INI_GET_ADDR();
+	char **p = ZEND_INI_GET_ADDR();
 	char *pathbuf, *ptr, *end;
 
 	if (stage == PHP_INI_STAGE_STARTUP || stage == PHP_INI_STAGE_SHUTDOWN || stage == PHP_INI_STAGE_ACTIVATE || stage == PHP_INI_STAGE_DEACTIVATE) {
diff --git a/main/main.c b/main/main.c
index afb9291586de2..8062f92fe1bdb 100644
--- a/main/main.c
+++ b/main/main.c
@@ -670,7 +670,7 @@ static PHP_INI_MH(OnUpdateInputEncoding)
 
 static PHP_INI_MH(OnUpdateReportMemleaks)
 {
-	bool *p = (bool *) ZEND_INI_GET_ADDR();
+	bool *p = ZEND_INI_GET_ADDR();
 	bool new_bool_value = zend_ini_parse_bool(new_value);
 
 	if (!new_bool_value) {
@@ -707,7 +707,7 @@ static PHP_INI_MH(OnUpdateErrorLog)
 			return FAILURE;
 		}
 	}
-	char **p = (char **) ZEND_INI_GET_ADDR();
+	char **p = ZEND_INI_GET_ADDR();
 	*p = new_value && ZSTR_LEN(new_value) > 0 ? ZSTR_VAL(new_value) : NULL;
 	return SUCCESS;
 }
@@ -722,7 +722,7 @@ static PHP_INI_MH(OnUpdateMailLog)
 			return FAILURE;
 		}
 	}
-	char **p = (char **) ZEND_INI_GET_ADDR();
+	char **p = ZEND_INI_GET_ADDR();
 	*p = new_value && ZSTR_LEN(new_value) > 0 ? ZSTR_VAL(new_value) : NULL;
 	return SUCCESS;
 }