diff --git a/ext/opcache/tests/jit/gh14267_001.phpt b/ext/opcache/tests/jit/gh14267_001.phpt
index 2e23016f899b..671923785717 100644
--- a/ext/opcache/tests/jit/gh14267_001.phpt
+++ b/ext/opcache/tests/jit/gh14267_001.phpt
@@ -10,7 +10,7 @@ opcache
 --FILE--
 <?php
 // Skip when JIT was completely disabled at runtime.
-if (($status = opcache_get_status()) === false || $status['jit']['enabled']) {
+if (($status = opcache_get_status()) === false || ($status['jit']['enabled'] ?? true)) {
     ini_set('opcache.jit', 'tracing');
 }
 ?>
diff --git a/ext/opcache/tests/jit/gh16393.phpt b/ext/opcache/tests/jit/gh16393.phpt
index e90fb53e21a2..23b79b8fd7d1 100644
--- a/ext/opcache/tests/jit/gh16393.phpt
+++ b/ext/opcache/tests/jit/gh16393.phpt
@@ -8,7 +8,7 @@ opcache.jit_buffer_size=64M
 --FILE--
 <?php
 // Skip when JIT was completely disabled at runtime.
-if (($status = opcache_get_status()) === false || $status['jit']['enabled']) {
+if (($status = opcache_get_status()) === false || ($status['jit']['enabled'] ?? true)) {
     ini_set('opcache.jit', 'tracing');
 }
 class Test {
diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index f7bda3c66bab..7dcfecf1f872 100644
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -339,11 +339,7 @@ static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp) /* {{{ */
 				value = &group_long;
 			}
 
-			if(wrapper->wops->stream_metadata(wrapper, filename, option, value, NULL)) {
-				RETURN_TRUE;
-			} else {
-				RETURN_FALSE;
-			}
+			RETURN_BOOL(wrapper->wops->stream_metadata(wrapper, filename, option, value, NULL));
 		} else {
 #ifndef PHP_WIN32
 /* On Windows, we expect regular chgrp to fail silently by default */
@@ -480,11 +476,7 @@ static void php_do_chown(INTERNAL_FUNCTION_PARAMETERS, int do_lchown) /* {{{ */
 				value = &user_long;
 			}
 
-			if(wrapper->wops->stream_metadata(wrapper, filename, option, value, NULL)) {
-				RETURN_TRUE;
-			} else {
-				RETURN_FALSE;
-			}
+			RETURN_BOOL(wrapper->wops->stream_metadata(wrapper, filename, option, value, NULL));
 		} else {
 #ifndef PHP_WIN32
 /* On Windows, we expect regular chown to fail silently by default */
@@ -638,11 +630,7 @@ PHP_FUNCTION(touch)
 	wrapper = php_stream_locate_url_wrapper(filename, NULL, 0);
 	if(wrapper != &php_plain_files_wrapper || strncasecmp("file://", filename, 7) == 0) {
 		if(wrapper && wrapper->wops->stream_metadata) {
-			if(wrapper->wops->stream_metadata(wrapper, filename, PHP_STREAM_META_TOUCH, newtime, NULL)) {
-				RETURN_TRUE;
-			} else {
-				RETURN_FALSE;
-			}
+			RETURN_BOOL(wrapper->wops->stream_metadata(wrapper, filename, PHP_STREAM_META_TOUCH, newtime, NULL));
 		} else {
 			php_stream *stream;
 			if(!filetime_is_null || !fileatime_is_null) {