diff --git a/changelog.txt b/changelog.txt
index 3a2a4c364c..7688976097 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -2,6 +2,12 @@ Found a bug? Have a great feature idea? Get on GitHub and tell us about it and w
 
 Our GitHub has the full list of all prior releases of Pods: https://github.com/pods-framework/pods/releases
 
+= 3.0.7 - October 19th, 2023 =
+
+* Fixed: Avoid duplicate fields showing up when registering fields manually through `pods_group_add()` instead of through normal DB or file-based configs. #6317 (@sc0ttkclark)
+* Fixed: Resolve cases where Settings pod types would treat every save as a new item. (@sc0ttkclark) 
+* Fixed: Swept through the codebase to fix all remaining return type issues with PHP 8+ for the most common extended/implemented methods. (@sc0ttkclark)
+
 = 3.0.6 - October 2nd, 2023 =
 
 * Fixed: Resolved a plugin conflict with The Events Calendar / Event Tickets plugins that was introduced in 3.0.5. (@sc0ttkclark)
@@ -2387,3 +2393,534 @@ Fixed: Serial comma display works again for Users, Comments, and Media relations
 * Added: ability to override pager var ($this->page_var)
 * Added: load_helper, load_pod, load_template, drop_helper, drop_pod, drop_template methods support the "name" field as well as the id
 * Added: load_page, drop_page methods support the "uri" field as well as the id
+
+= 1.8.2 - February 14th, 2010 =
+
+* IMPROVED: PICK taxonomy support (not just categories)
+* IMPROVED: "Browse Content" styling
+* ADDED: import/export file column support
+* FIXED: magic tag bug with "wp_" column names
+* FIXED: replaced str_split for PHP4 users
+* FIXED: $_POSTs in save_pod_item (API)
+* FIXED: weird Pod Page chars added when using nginx proxy
+
+= 1.8.1 - January 17th, 2010 =
+
+* ADDED: Pre-drop and Post-drop helpers
+* ADDED: Several plugin hook actions, e.g. "pods_pre_save_pod_item"
+* IMPROVED: bypass Pod Pages when $pods = 404
+* IMPROVED: <label> added to each input field
+* IMPROVED: Before/After helpers are now Pre-save/Post-save helpers
+* FIXED: date picker for Public Forms
+* FIXED: IE issue when saving a form
+
+= 1.8.0 - January 5th, 2010 =
+
+* IMPROVED: custom publicForm() ordering
+* FIXED: DB error when using Input Filters
+* FIXED: UTF-8 characters in "code" columns
+
+= 1.7.9 - December 17th, 2009 =
+
+* ADDED: full API for database IO
+* ADDED: support for wp-config.php above webroot
+* IMPROVED: AJAX requests now go through the API
+* IMPROVED: nicEdit.js and swfupload.js load only when needed
+* IMPROVED: New MySQL tables use UTF-8
+* FIXED: PHP warnings break AJAX output
+* FIXED: Removed <br /> from default nicEdit output
+* FIXED: "headers already sent" warning
+* FIXED: IE issue with the datepicker
+
+= 1.7.8 - November 13th, 2009 =
+
+* IMPROVED: file column: "Browse Server" feature
+* IMPROVED: File uploader automatically detects max upload size
+* FIXED: PHP warning on Roles page when no pods exist
+
+= 1.7.7 - November 6th, 2009 =
+
+* FIXED: bug when renaming columns
+* FIXED: bug with duplicate file progress bars
+* FIXED: nicEdit width bug in IE
+* FIXED: uninstall script
+* FIXED: bug with Pod Pages not being found (for WP subdirectory installs)
+* FIXED: state + country data not being loaded with clean install
+
+= 1.7.6 - October 27th, 2009 =
+
+* NOTE: BACKUP YOUR DATABASE BEFORE UPGRADING!
+* IMPROVED: Brand new file uploader
+* IMPROVED: Complete file column integration w/ WP Media Manager
+* ADDED: Drag-n-drop column sorting under "Manage Pods"
+* IMPROVED: get_field() to support new file columns
+* FIXED: Bug when adding a new PICK column
+
+= 1.7.5 - October 15th, 2009 =
+
+* FIXED: Pod Page precode couldn't access some WP core functions
+* FIXED: Now using STYLESHEETPATH instead of TEMPLATEPATH (for child theme support, thanks xentek)
+* FIXED: Killed the pesky 404 for Pod Pages (thanks Scott)
+* FIXED: Pods menu won't appear for users with no access (thanks Scott)
+* IMPROVED: Interface cleanup (*ahem* Welcome page)
+* ADDED: Help text within the Pods management panel
+* ADDED: Ability to view the changelog from within the Welcome page
+* ADDED: is_pod_page() function
+
+= 1.7.4 - September 30th, 2009 =
+
+* ADDED: Multiple public forms on a single page
+* ADDED: Submit button "label" parameter for publicForm()
+* FIXED: better SESSION conflict handling
+* FIXED: When editing an item, public forms would overwrite ALL columns (even when a user specifies columns to use)
+
+= 1.7.3 - September 21th, 2009 =
+
+* ADDED: Detail Page option under Manage Pods
+* IMPROVED: pagination hidden unless needed
+* IMPROVED: role manager now using checkboxes
+* IMPROVED: pods_url_variable() now supports POST and SESSION variables
+* FIXED: rare jQuery conflict that disabled the submit button on Public Forms
+* CHANGED: Magic Tag functionality with PICK columns (see "print_field" package)
+
+
+= 1.7.2 - September 2nd, 2009 =
+
+* ADDED: dot-traversal for get_field() and Magic Tags (thanks JP)
+* IMPROVED: public form security (less "Form token expired" nags, better validation)
+* IMPROVED: slug columns are now *really* unique
+* IMPROVED: more efficient findRecords() - table JOINs are only used when needed
+* FIXED: minor bug when determining which Pod Page takes precedence (thanks Scott)
+* FIXED: major permissions bug with pods_access (thanks Scott)
+* FIXED: The default column type was blank in Safari
+* FIXED: fatal bug when importing a CSV file with the Pods API (thanks Andy)
+* FIXED: Pod() input parameters now being sanitized (thanks Scott)
+* FIXED: session_start() moved into the WP "init" hook (to play nice with Shopp and other plugins)
+
+= 1.7.1 - August 16th, 2009 =
+
+* ADDED: Pods API (for importing and exporting data)
+* FIXED: bug when using the "PICK filter" option with WP Posts/Pages
+
+= 1.7.0 - July 25th, 2009 =
+
+* FIXED: fresh install bugs from 1.6.8 and 1.6.9 (really!)
+
+= 1.6.9 - July 24th, 2009 =
+
+* FIXED: Fatal error upon fresh install
+
+= 1.6.8 - July 24th, 2009 =
+
+* IMPROVED: Public Form security
+* ADDED: Built-in support for JSON (for servers without it)
+* ADDED: Two new constants: PODS_DIR and PODS_URL
+* FIXED: Dropdown positioning bug in Manage Pods
+* FIXED: Some reported warning messages within Manage Roles
+* FIXED: Red asterisk (*) not appearing for required fields
+
+= 1.6.7 - June 27th, 2009 =
+
+* ADDED: Shortcode
+* CHANGED: output buffering added to showTemplate() -- use "echo" to output
+* FIXED: Public forms
+
+= 1.6.6 - June 23rd, 2009 =
+
+* IMPROVED: Package Manager UI
+* ADDED: new $action parameter for getFilters()
+* ADDED: the column box "jiggles" to grab the user's attention
+* FIXED: rare bug with bi-directional relationships (thanks Scott)
+* FIXED: potential bug when using Pods with https:// (thanks Scott)
+* FIXED: column comments weren't getting saved (thanks Scott)
+
+= 1.6.5 - June 10th, 2009 =
+
+* FIXED: column order not being respected (thanks Mike)
+* FIXED: Pod Pages when WP is installed in a subdirectory (thanks Jonah)
+* FIXED: error handling when trying to add a column without a name
+* FIXED: Menu Editor bug (will require WP 2.8)
+
+= 1.6.4 - June 7th, 2009 =
+
+* CHANGED: usability and design overhaul
+* ADDED: Input helpers (you now have to ability to completely customize each individual input field!)
+* FIXED: file picker when WP is installed in a subdirectory
+* IMPROVED: minor code tweaks; slightly greater improved performance
+* IMPROVED: added INDEXES to several Pod tables (for fresh installs)
+* CHANGED: moved the code for displaying fields out of Pod.class.php (now in core/input_fields.php)
+
+= 1.6.3 - June 2nd, 2009 =
+
+* FIXED: bug when deleting columns
+* CHANGED: core files are in the /core/ folder
+
+= 1.6.2 - May 28th, 2009 =
+
+* IMPROVED: {@detail_url} magic tag
+* IMPROVED: templates are now part of the Package Manager
+* ADDED: pods_url_variable()
+* FIXED: bug when trying to delete templates
+* IMPROVED: better default examples (requires fresh install)
+* IMPROVED: "country" and "list" pods are visible (requires fresh install)
+* CHANGED: Pod Page URIs now do NOT need beginning or tailing slashes
+
+= 1.6.1 - May 22nd, 2009 =
+
+* FIXED: tiny (but critical) typo in Pod.class.php - thanks Scott!
+
+= 1.6.0 - May 22nd, 2009 =
+
+* CHANGED: Pod templates are now independent from Pods
+* ADDED: PICK column filtering
+* CHANGED: PHP code is now allowed within Pod templates (use with caution)
+* FIXED: date picker now works on Public Forms
+* Minor styling changes (work in progress)
+
+= 1.5.9 - May 1st, 2009 =
+
+* FIXED: the wordpress.org ZIP builder was stripping out the .htaccess file
+* FIXED: list filter dropdowns
+* IMPROVED: escaped DB columns (to prevent any conflicts with MySQL reserved words)
+* FIXED: minor bug with the Package Manager
+* UPDATED: jqModal
+* IMPROVED: escaped special characters in the Admin browse area
+* IMPROVED: get_content() now supports filter hooks (so other plugins can modify the Pods output)
+
+= 1.5.8 - April 25th, 2009 =
+
+* ADDED: Package Manager BETA
+* FIXED: Using the $orderby parameter with get_field()
+* FIXED: file uploader should now work with Public Forms
+* IMPROVED: Suppressed WP "smart" redirects if a matching Pod Page exists
+
+= 1.5.7 - April 10th, 2009 =
+
+* IMPROVED: public forms now allow for editing existing items
+* ADDED: jQuery added to form.php (in case it isn't called from the header)
+* FIXED: error in pods_navigation HTML (thanks to Mark)
+* IMPROVED: removed some global variable dependencies
+
+= 1.5.6 - April 7th, 2009 =
+
+* ADDED: {@created} and {@modified} as default Magic Tags
+* FIXED: list filters (from version 1.5.4)
+
+= 1.5.5 - March 21st, 2009 =
+
+* FIXED: PICK category columns
+* ADDED: sorting of PICK items: get_field($field_name, $orderby)
+* ADDED: server information on the welcome screen
+* FIXED: minor bug with retrieving a pod's slug
+
+= 1.5.4 - March 12th, 2009 =
+
+* ADDED: full PICK column support in findRecords() -- finally!
+* FIXED: bool columns now default at 0 instead of null
+
+= 1.5.3 - March 4th, 2009 =
+
+* FIXED: access control can no longer be "hacked" through Firebug
+* FIXED: users can no longer select a pick column -- Header -- by accident
+* FIXED: blank slug columns stopped auto-generating in 1.5.1
+* ADDED: {@type} Magic Tag (for getting an item's pod name)
+
+= 1.5.2 - March 1st, 2009 =
+
+* FIXED: minor bug when editing an existing Pod item
+* FIXED: minor bug when de-selecting all of a PICK column's items
+
+= 1.5.1 - February 28th, 2009 =
+
+* ADDED: full helper functionality (Display, Before, After)
+* IMPROVED: saving record data is now much more efficient
+* FIXED: roles now work properly on server with non-standard table prefixes
+* FIXED: unique PICK columns now work properly
+* FIXED: Pods now works even when columns are named with a MySQL reserved word
+
+= 1.5.0 - February 21st, 2009 =
+
+* ADDED: helpers now have several different flavors:
+	* Display helpers run right before a column is displayed
+	* Before helpers run right before a record is saved (useful for validation, etc.)
+	* After helpers run right after a record is saved (useful for confirmation emails, etc.)
+* IMPROVED: UI on PodPages and Helpers pages
+* IMPROVED: the plugin now remembers your last (admin) Pod tab on refresh
+* ADDED: slug column type for creating permalinks (leaving it blank will auto-generate a slug based on the name column)
+* ADDED: "unique" & "multiple" column options (single select PICK lists!)
+* ADDED: Page Templates (files in your theme folder) can now be selected for PodPages
+* ADDED: a slug can be passed into the 2nd parameter of a new Pod() instead of an ID
+* Numerous improvements to DB structure (removed all wp_posts dependencies)
+* FIXED: associated rows in wp_pods are properly deleted with a datatype
+* FIXED: update script when upgrading from < 1.3.2
+
+= 1.4.9 - February 11th, 2009 =
+
+* ADDED: Ability to choose WP Page, WP Post, WP User from PICK columns
+* CHANGED: Widgets are now called Helpers (to clear confusion)
+* FIXED: Role manager now works properly with Manage Pods
+* FIXED: Warnings on Roles page
+* ADDED: Welcome page
+
+= 1.4.8 - February 10th, 2009 =
+
+* Added role management/access control support
+* Improved public forms (date picker & file picker work)
+* Fixed bug with sister fields (bi-directional relationships)
+* Fixed zebra stripes on content listing pages (in Admin)
+* Pods now requires PHP 5.2 or above
+
+= 1.4.7 - February 3rd, 2009 =
+
+* Cleaned up admin interface
+* Added pod_widget() function - now you can use widgets in PodPages or WP Template files
+* Minor bugfix with Page Title generation
+
+= 1.4.6 - January 30th, 2009 =
+
+* FIXED: Menu Editor wouldn't work if WP is installed in a sub-directory
+* FIXED: The Pods menu now properly appears for Admins
+* ADDED: set_field() function for storing class data
+
+= 1.4.5 - January 27th, 2009 =
+
+* ADDED: Menu Editor (easily create navigation menus)
+* ADDED: Page Title option for PodPages
+* ADDED: Page Template option for PodPages
+* IMPROVED: Pods title generation
+* Miscellaneous bugfixes
+
+= 1.4.4 - January 24th, 2009 =
+
+* FIXED: 404 status headers
+* FIXED: uninstall.php now removes ALL pod items
+* ADDED: button to easily add links in the WYSIWYG editor
+* ADDED: lightweight access controls
+* Admins can add/edit items and manage pods
+* Editors can add/edit items for all Top Level pods
+* Editors cannot manage pods/podpages/widgets/settings
+
+= 1.4.3 - January 23rd, 2009 =
+
+* ADDED: Pods can optionally be TOP LEVEL menu items
+* CHANGED: Pod.class.php is auto-included (doesn't need to be manually added for WP Pages)
+* FIXED: improved 404 handling
+* FIXED: Pods would break when the "body" column was removed
+* FIXED: column names are now properly formatted to prevent DB errors
+* FIXED: when added, new columns now appear below existing columns
+* FIXED: all Pod items are now deleted when their Pod gets dropped
+* FIXED: SQL error when changing the column type to/from PICK
+* FIXED: Some column fields were wrongly disabled under certain conditions
+
+= 1.4.2 - January 17th, 2009 =
+
+* CRITICAL BUGFIX: Saving PICK column data sometimes returned fatal "Cannot add sister relationships" error.
+
+= 1.4.1 - January 16th, 2009 =
+
+* FIXED (hopefully): Manually uploading Pods from a Windows PC to a Unix server cause hidden newline characters to be stripped from some files (e.g. ajax/load.php)
+* CHANGED: $latest changed to $pods_latest to prevent conflicts with other plugins
+
+= 1.4.0 - January 9th, 2009 =
+
+* Added authentication to AJAX files to prevent non-admin access
+* Added new column type: CODE (long text without the WYSIWYG editor)
+* Fixed date picker bugs
+* The {@detail_url} magic tag now works when WordPress is installed in a subdirectory
+* The "body" column can now be optionally removed
+* Improved redirection handling (init.php)
+
+= 1.3.9 - January 6th, 2009 =
+
+* Added lightweight date/time picker in Admin
+* Added support for custom SQL query in findRecords()
+
+= 1.3.8 - January 3rd, 2009 =
+
+* Added uninstall.php
+* Replace remaining mysql_query() functions with pod_query()
+* Renamed initialize() to pod_init() to prevent conflicts
+* All thanks to Scott Clark
+
+= 1.3.7 - January 1st, 2009 =
+
+* Installation bugfixes (init.php, dump.sql)
+* Improvements to router.php
+* NOTE: create pods.php in your theme directory and style per instructions in router.php
+
+= 1.3.6 =
+
+Missing changelog for this version.
+
+= 1.3.5 =
+
+* Fixes for "Reset database" option
+* ajax calls use POST instead of GET (to bypass size limit)
+* Fix for BOOLEAN types & options table
+
+= 1.3.4 =
+
+* Added "Reset database" option under Pods > Settings
+
+= 1.3.3 =
+
+* Fixed SQL statements that might've been breaking Pods on strict MySQL servers
+* Added header META tag for Pods version identification
+
+= 1.3.2 =
+
+* Standardised SQL error reporting (thanks to Scott Clark)
+* Added $where parameter to findRecords()
+* Added preview of upcoming Layout Editor functionality
+* Miscellaneous improvements
+
+= 1.3.1 =
+
+* All Pod tables are now prefixed with"pod_"
+* Added WYSIWYG editor to all textareas when adding/editing Pod content
+* Improved init.php and update.php for better versioning
+* In "Manage Content", the modified date is being used instead of the creation date
+
+= 1.3.0 =
+
+* Bugfix: problem with dump.sql when fresh installing 1.2.9
+
+= 1.2.9 =
+
+* Bugfixes: problem saving new Pod items
+
+= 1.2.8 =
+
+* "Name" and "Body" column labels are now editable
+* Minor bugfixes with "Browse Content" area
+
+= 1.2.7 =
+
+* NEW: "comment" field for columns (useful for containing tips)
+* NEW: added wildcard support for using the same page code on multiple pages (e.g. /products/shoes/*)
+* FIXED: pagination wasn't working in 1.2.6
+* .htaccess installation step is now automated
+
+= 1.2.6 =
+
+* NEW: content is added without needing to relate it to a post
+* Revamped admin menu
+* NEW: admin page to browse all pod content
+* UPDATED: sql/update.php to smoothly update the DB to 1.2.6 standards
+
+= 1.2.5 =
+
+* Support for custom table prefixes (thanks to Scott Clark)
+
+= 1.2.4 =
+
+* Fixed MAMP problem when loading initial DB data
+* Added support for custom pagination label: $Record->getPagination('Go to page:');
+* Minor code consistency and styling enhancements
+
+= 1.2.3 =
+
+* Greatly improved public forms: allows for columns to be hidden and/or filled with default values. Documentation coming shortly.
+
+= 1.2.2 =
+
+* Added support for public input forms
+
+= 1.2.1 =
+
+* Removed several PHP warnings when making database calls
+
+= 1.2.0 =
+
+* Added widgets functionality
+* Added some default Pods, pages, and widgets on fresh install
+* Changed magic tag parameter order: {@column_name, widget_name, text_before, text_after}
+
+= 1.1.9 =
+
+* Bug fix: links now working when WP isn't on the server root
+* Bug fix: file picker determines correct upload path
+* Numerous style enhhancements
+
+= 1.1.8 =
+
+* Added "Label" column field
+* Added "Required" column option
+
+= 1.1.7 =
+
+* Bug fix: filtering now keeps you on the same list page
+
+= 1.1.6 =
+
+* Posts are automatically tagged with its related Pod (for easy searching in Admin) -- e.g. "pod-event"
+
+= 1.1.5 =
+
+* Single "Save" button when editing a post
+* Support for both Visual and HTML editors
+
+= 1.1.4 =
+
+* Styling improvements
+
+= 1.1.3 =
+
+* Fixed get_post_id()
+* Disallowed columns from being named "type" or "page"
+
+= 1.1.2 =
+
+* Pagination CSS support
+* Moved custom pages from filesystem to the DB
+* Added "Pods Pages" admin page manager
+* Fixed "Related to" column when creating bi-directional relationships
+
+= 1.1.1 =
+
+* Support for "list filter" string override
+
+= 1.1.0 =
+
+* Added "edit_url" magic tag
+* Better dropdown CSS formatting
+
+= 1.0.9 =
+
+* Fixed column editing, dropdown filters
+
+= 1.0.8 =
+
+* Fixed bug when deleting pods
+
+= 1.0.7 =
+
+* Fixed post deletion hook
+* Fixed pagination when rows per page (rpp) <> 15
+
+= 1.0.6 =
+
+* Added AJAX file picker
+* Improved magic tags support
+
+= 1.0.5 =
+
+* Allowed column type editing
+* Removed excess icons
+
+= 1.0.4 =
+
+* Added show/hide controls for management page options
+
+= 1.0.3 =
+
+* Newly added pods are now clickable without refresh
+
+= 1.0.2 =
+
+* Added state & country tables
+
+= 1.0.1 =
+
+* Fixed boolean type
+* Added readme.txt
diff --git a/classes/Pods.php b/classes/Pods.php
index 12363395f7..3e091df7de 100644
--- a/classes/Pods.php
+++ b/classes/Pods.php
@@ -4593,6 +4593,7 @@ private function do_hook( $name ) {
 	 *
 	 * @since 2.0.0
 	 */
+	#[\ReturnTypeWillChange]
 	public function __get( $name ) {
 		$name = (string) $name;
 
@@ -4659,7 +4660,7 @@ public function __get( $name ) {
 	 *
 	 * @since 2.8.0
 	 */
-	public function __set( $name, $value ) {
+	public function __set( $name, $value ): void {
 		$name = (string) $name;
 
 		$supported_pods_data = array(
@@ -4691,7 +4692,7 @@ public function __set( $name, $value ) {
 	 *
 	 * @since 2.8.0
 	 */
-	public function __isset( $name ) {
+	public function __isset( $name ): bool {
 		$value = $this->__get( $name );
 
 		return ( null !== $value );
@@ -4704,7 +4705,7 @@ public function __isset( $name ) {
 	 *
 	 * @since 2.8.0
 	 */
-	public function __unset( $name ) {
+	public function __unset( $name ): void {
 		$this->__set( $name, null );
 	}
 
@@ -4712,19 +4713,20 @@ public function __unset( $name ) {
 	 * Handle methods that have been deprecated and any aliasing.
 	 *
 	 * @param string $name Function name.
-	 * @param array  $args Arguments passed to function.
+	 * @param array  $arguments Arguments passed to function.
 	 *
 	 * @return mixed|null
 	 *
 	 * @since 2.0.0
 	 */
-	public function __call( $name, $args ) {
+	#[\ReturnTypeWillChange]
+	public function __call( $name, $arguments ) {
 
 		$name = (string) $name;
 
 		// select > find alias.
 		if ( 'select' === $name ) {
-			return call_user_func_array( array( $this, 'find' ), $args );
+			return call_user_func_array( array( $this, 'find' ), $arguments );
 		}
 
 		if ( ! $this->deprecated ) {
@@ -4736,7 +4738,7 @@ public function __call( $name, $args ) {
 		$pod_class_exists = class_exists( 'Deprecated_Pod' );
 
 		if ( method_exists( $this->deprecated, $name ) ) {
-			return call_user_func_array( array( $this->deprecated, $name ), $args );
+			return call_user_func_array( array( $this->deprecated, $name ), $arguments );
 			// @codingStandardsIgnoreLine
 		} elseif ( ! $pod_class_exists || Deprecated_Pod::$deprecated_notice ) {
 			pods_deprecated( "Pods::{$name}", '2.0' );
@@ -4750,7 +4752,7 @@ public function __call( $name, $args ) {
 	 *
 	 * @return string Pod type and name in CURIE notation
 	 */
-	public function __toString() {
+	public function __toString(): string {
 
 		$string = '';
 
diff --git a/classes/PodsAPI.php b/classes/PodsAPI.php
index b532cc6173..d2bda23376 100644
--- a/classes/PodsAPI.php
+++ b/classes/PodsAPI.php
@@ -4844,10 +4844,22 @@ public function save_pod_item( $params ) {
 			return $ids;
 		}
 
+		// Get array of Pods
+		$pod = $this->load_pod( array( 'id' => $params->pod_id, 'name' => $params->pod ), false );
+
+		if ( false === $pod ) {
+			// Bypass if doing a normal object sync from PodsMeta.
+			if ( $params->podsmeta ) {
+				return;
+			}
+
+			return pods_error( __( 'Pod not found', 'pods' ), $error_mode );
+		}
+
 		// Allow Helpers to know what's going on, are we adding or saving?
 		$is_new_item = false;
 
-		if ( empty( $params->id ) ) {
+		if ( empty( $params->id ) && 'settings' !== $pod['type'] ) {
 			$is_new_item = true;
 		}
 
@@ -4869,18 +4881,6 @@ public function save_pod_item( $params ) {
 			$allow_custom_fields = true;
 		}
 
-		// Get array of Pods
-		$pod = $this->load_pod( array( 'id' => $params->pod_id, 'name' => $params->pod ), false );
-
-		if ( false === $pod ) {
-			// Bypass if doing a normal object sync from PodsMeta.
-			if ( $params->podsmeta ) {
-				return;
-			}
-
-			return pods_error( __( 'Pod not found', 'pods' ), $error_mode );
-		}
-
 		$params->pod    = $pod['name'];
 		$params->pod_id = $pod['id'];
 
@@ -4984,7 +4984,7 @@ public function save_pod_item( $params ) {
 		}
 
 		// Handle hidden fields
-		if ( empty( $params->id ) ) {
+		if ( empty( $params->id ) && 'settings' !== $pod['type'] ) {
 			foreach ( $fields as $field => $field_data ) {
 				if ( in_array( $field, $fields_active, true ) ) {
 					continue;
@@ -11490,6 +11490,7 @@ private function do_hook() {
 	 *
 	 * @since 2.0.0
 	 */
+	#[\ReturnTypeWillChange]
 	public function __get( $name ) {
 
 		$name = (string) $name;
diff --git a/classes/PodsArray.php b/classes/PodsArray.php
index 4eb4ca29f2..5044c338f0 100644
--- a/classes/PodsArray.php
+++ b/classes/PodsArray.php
@@ -35,16 +35,12 @@ public function __construct( $container ) {
 	 * @return mixed
 	 * @since 2.0.0
 	 */
-	#[\ReturnTypeWillChange]
-	public function offsetSet( $offset, $value ) {
-
+	public function offsetSet( $offset, $value ): void {
 		if ( is_array( $this->__container ) ) {
 			$this->__container[ $offset ] = $value;
 		} else {
 			$this->__container->{$offset} = $value;
 		}
-
-		return $value;
 	}
 
 	/**
@@ -57,7 +53,6 @@ public function offsetSet( $offset, $value ) {
 	 */
 	#[\ReturnTypeWillChange]
 	public function offsetGet( $offset ) {
-
 		if ( is_array( $this->__container ) ) {
 			if ( isset( $this->__container[ $offset ] ) ) {
 				return $this->__container[ $offset ];
@@ -77,9 +72,7 @@ public function offsetGet( $offset ) {
 	 * @return bool
 	 * @since 2.0.0
 	 */
-	#[\ReturnTypeWillChange]
-	public function offsetExists( $offset ) {
-
+	public function offsetExists( $offset ): bool {
 		if ( is_array( $this->__container ) ) {
 			return isset( $this->__container[ $offset ] );
 		}
@@ -94,9 +87,7 @@ public function offsetExists( $offset ) {
 	 *
 	 * @since 2.0.0
 	 */
-	#[\ReturnTypeWillChange]
-	public function offsetUnset( $offset ) {
-
+	public function offsetUnset( $offset ): void {
 		if ( is_array( $this->__container ) ) {
 			unset( $this->__container[ $offset ] );
 		} else {
@@ -205,52 +196,49 @@ public function dump() {
 	/**
 	 * Mapping >> offsetSet
 	 *
-	 * @param mixed $offset Property name.
+	 * @param mixed $name Property name.
 	 * @param mixed $value  Property value.
 	 *
 	 * @return mixed
 	 * @since 2.0.0
 	 */
-	public function __set( $offset, $value ) {
-
-		return $this->offsetSet( $offset, $value );
+	public function __set( $name, $value ): void {
+		$this->offsetSet( $name, $value );
 	}
 
 	/**
 	 * Mapping >> offsetGet
 	 *
-	 * @param mixed $offset Property name.
+	 * @param mixed $name Property name.
 	 *
 	 * @return mixed|null
 	 * @since 2.0.0
 	 */
-	public function __get( $offset ) {
-
-		return $this->offsetGet( $offset );
+	#[\ReturnTypeWillChange]
+	public function __get( $name ) {
+		return $this->offsetGet( $name );
 	}
 
 	/**
 	 * Mapping >> offsetExists
 	 *
-	 * @param mixed $offset Property name.
+	 * @param mixed $name Property name.
 	 *
 	 * @return bool
 	 * @since 2.0.0
 	 */
-	public function __isset( $offset ) {
-
-		return $this->offsetExists( $offset );
+	public function __isset( $name ): bool {
+		return $this->offsetExists( $name );
 	}
 
 	/**
 	 * Mapping >> offsetUnset
 	 *
-	 * @param mixed $offset Property name.
+	 * @param mixed $name Property name.
 	 *
 	 * @since 2.0.0
 	 */
-	public function __unset( $offset ) {
-
-		$this->offsetUnset( $offset );
+	public function __unset( $name ): void {
+		$this->offsetUnset( $name );
 	}
 }
diff --git a/classes/PodsData.php b/classes/PodsData.php
index b823901cd7..5199ce863b 100644
--- a/classes/PodsData.php
+++ b/classes/PodsData.php
@@ -442,7 +442,7 @@ public function insert( $table, $data, $format = null ) {
 			}
 		}
 
-		list( $table, $data, $format ) = self::do_hook( 'insert', array( $table, $data, $format ), $this );
+		[ $table, $data, $format ] = self::do_hook( 'insert', array( $table, $data, $format ), $this );
 
 		$result          = $wpdb->insert( $table, $data, $format );
 		$this->insert_id = $wpdb->insert_id;
@@ -560,7 +560,7 @@ public function update( $table, $data, $where, $format = null, $where_format = n
 			}
 		}
 
-		list( $table, $data, $where, $format, $where_format ) = self::do_hook(
+		[ $table, $data, $where, $format, $where_format ] = self::do_hook(
 			'update', array(
 				$table,
 				$data,
@@ -626,7 +626,7 @@ public function delete( $table, $where, $where_format = null ) {
 
 		$sql = "DELETE FROM `$table` WHERE " . implode( ' AND ', $wheres );
 
-		list( $sql, $where ) = self::do_hook(
+		[ $sql, $where ] = self::do_hook(
 			'delete', array(
 				$sql,
 				array_values( $where ),
@@ -1965,7 +1965,7 @@ public function reorder( $table, $weight_field, $id_field, $ids ) {
 		$success = false;
 		$ids     = (array) $ids;
 
-		list( $table, $weight_field, $id_field, $ids ) = self::do_hook(
+		[ $table, $weight_field, $id_field, $ids ] = self::do_hook(
 			'reorder', array(
 				$table,
 				$weight_field,
@@ -2622,7 +2622,7 @@ public static function prepare( $sql, $data ) {
 		 * @var $wpdb wpdb
 		 */
 		global $wpdb;
-		list( $sql, $data ) = apply_filters( 'pods_data_prepare', array( $sql, $data ) );
+		[ $sql, $data ] = apply_filters( 'pods_data_prepare', array( $sql, $data ) );
 
 		return $wpdb->prepare( $sql, $data );
 	}
@@ -3907,6 +3907,7 @@ public static function get_db_field( $params ) {
 	 *
 	 * @since 2.8.0
 	 */
+	#[\ReturnTypeWillChange]
 	public function __get( $name ) {
 		$name = (string) $name;
 
@@ -3964,7 +3965,7 @@ public function __get( $name ) {
 	 *
 	 * @since 2.8.0
 	 */
-	public function __set( $name, $value ) {
+	public function __set( $name, $value ): void {
 		$supported_overrides = array(
 			'select'        => 'select',
 			'table'         => 'table',
@@ -3992,7 +3993,7 @@ public function __set( $name, $value ) {
 	 *
 	 * @since 2.8.0
 	 */
-	public function __isset( $name ) {
+	public function __isset( $name ): bool {
 		// Handle alias Pod properties.
 		$supported_pods_object = array(
 			'pod'           => 'name',
@@ -4034,7 +4035,7 @@ public function __isset( $name ) {
 	 *
 	 * @since 2.8.0
 	 */
-	public function __unset( $name ) {
+	public function __unset( $name ): void {
 		// Don't do anything.
 		return;
 	}
diff --git a/classes/PodsForm.php b/classes/PodsForm.php
index d3da12f902..6b92904138 100644
--- a/classes/PodsForm.php
+++ b/classes/PodsForm.php
@@ -76,6 +76,7 @@ private function __construct() {
 	 *
 	 * @since 2.3.0
 	 */
+	#[\ReturnTypeWillChange]
 	private function __clone() {
 		// Hulk smash
 	}
diff --git a/classes/PodsMeta.php b/classes/PodsMeta.php
index a6a50fe194..4cf66c2aa0 100644
--- a/classes/PodsMeta.php
+++ b/classes/PodsMeta.php
@@ -1021,6 +1021,10 @@ public function groups_get( $type, $name, $default_fields = null, $full_objects
 			}
 
 			if ( $has_custom_groups ) {
+				// Clean up the dynamic groups to prevent duplicate fields showing.
+				$this->groups_cleanup( $groups, self::$groups[ $type ][ $name ] );
+
+				// Now add our custom groups to those dynamic groups.
 				$groups = array_merge( $groups, self::$groups[ $type ][ $name ] );
 			}
 		} elseif ( $has_custom_groups ) {
@@ -1060,6 +1064,50 @@ public function groups_get( $type, $name, $default_fields = null, $full_objects
 		return $groups;
 	}
 
+	/**
+	 * Clean up the groups to prevent duplicate fields from showing based on reference groups.
+	 *
+	 * @since 3.0.7
+	 *
+	 * @param array $groups           The groups to clean up.
+	 * @param array $reference_groups The groups to reference for fields that take precedence.
+	 */
+	public function groups_cleanup( array &$groups, array &$reference_groups ) {
+		$found_fields = [];
+
+		// Remove duplicates fields from reference groups.
+		foreach ( $reference_groups as $group_key => $reference_group ) {
+			$group_fields = wp_list_pluck( $reference_group['fields'], 'name' );
+
+			foreach ( $group_fields as $field_key => $field_name ) {
+				// Remove duplicate fields.
+				if ( isset( $found_fields[ $field_name ] ) ) {
+					unset( $reference_groups[ $group_key ]['fields'][ $field_key ] );
+
+					continue;
+				}
+
+				$found_fields[ $field_name ] = true;
+			}
+		}
+
+		// Remove duplicates fields from groups.
+		foreach ( $groups as $group_key => $group ) {
+			$group_fields = wp_list_pluck( $group['fields'], 'name' );
+
+			foreach ( $group_fields as $field_key => $field_name ) {
+				// Remove duplicate fields.
+				if ( isset( $found_fields[ $field_name ] ) ) {
+					unset( $groups[ $group_key ]['fields'][ $field_key ] );
+
+					continue;
+				}
+
+				$found_fields[ $field_name ] = true;
+			}
+		}
+	}
+
 	/**
 	 * @param      $post_type
 	 * @param null $post
diff --git a/deprecated/deprecated.php b/deprecated/deprecated.php
index 93e577f576..6a3df0846b 100644
--- a/deprecated/deprecated.php
+++ b/deprecated/deprecated.php
@@ -151,6 +151,7 @@ public function __construct( $type = null, $id = null ) {
 	 *
 	 * @return array|bool|int|mixed|PodsData
 	 */
+	#[\ReturnTypeWillChange]
 	public function __get( $name ) {
 		$name = (string) $name;
 
@@ -194,15 +195,11 @@ public function __get( $name ) {
 	 *
 	 * @param string $name  Property name.
 	 * @param mixed  $value Property value to set.
-	 *
-	 * @return mixed
 	 */
-	public function __set( $name, $value ) {
+	public function __set( $name, $value ): void {
 		$name = (string) $name;
 
 		$this->new->{$name} = $value;
-
-		return $value;
 	}
 
 	/**
@@ -211,14 +208,15 @@ public function __set( $name, $value ) {
 	 * @since 2.0.0
 	 *
 	 * @param string $name Call name.
-	 * @param array  $args Call arguments.
+	 * @param array  $arguments Call arguments.
 	 *
 	 * @return mixed
 	 */
-	public function __call( $name, $args ) {
+	#[\ReturnTypeWillChange]
+	public function __call( $name, $arguments ) {
 		$name = (string) $name;
 
-		return call_user_func_array( array( $this->new, $name ), $args );
+		return call_user_func_array( array( $this->new, $name ), $arguments );
 	}
 
 	/**
@@ -230,7 +228,7 @@ public function __call( $name, $args ) {
 	 *
 	 * @return bool
 	 */
-	public function __isset( $name ) {
+	public function __isset( $name ): bool {
 		$name = (string) $name;
 
 		if ( in_array( $name, array( '_data', 'data', 'total', 'total_rows', 'zebra' ), true ) ) {
@@ -279,6 +277,7 @@ public function __construct( $type = null, $format = null ) {
 	 *
 	 * @return null|mixed
 	 */
+	#[\ReturnTypeWillChange]
 	public function __get( $name ) {
 		$name = (string) $name;
 
@@ -293,14 +292,15 @@ public function __get( $name ) {
 	 * @since 2.0.0
 	 *
 	 * @param string $name Call name.
-	 * @param array  $args Call arguments.
+	 * @param array  $arguments Call arguments.
 	 *
 	 * @return mixed
 	 */
-	public function __call( $name, $args ) {
+	#[\ReturnTypeWillChange]
+	public function __call( $name, $arguments ) {
 		$name = (string) $name;
 
-		return call_user_func_array( array( $this->new, $name ), $args );
+		return call_user_func_array( array( $this->new, $name ), $arguments );
 	}
 }
 
diff --git a/init.php b/init.php
index 742e9499b3..f8096589d1 100644
--- a/init.php
+++ b/init.php
@@ -10,7 +10,7 @@
  * Plugin Name:       Pods - Custom Content Types and Fields
  * Plugin URI:        https://pods.io/
  * Description:       Pods is a framework for creating, managing, and deploying customized content types and fields
- * Version:           3.0.6
+ * Version:           3.0.7
  * Author:            Pods Framework Team
  * Author URI:        https://pods.io/about/
  * Text Domain:       pods
@@ -43,7 +43,7 @@
 	add_action( 'init', 'pods_deactivate_pods_ui' );
 } else {
 	// Current version.
-	define( 'PODS_VERSION', '3.0.6' );
+	define( 'PODS_VERSION', '3.0.7' );
 
 	// Current database version, this is the last version the database changed.
 	define( 'PODS_DB_VERSION', '2.3.5' );
diff --git a/package.json b/package.json
index 45327c0c53..0574efa810 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pods",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "description": "Pods is a development framework for creating, extending, managing, and deploying customized content types in WordPress.",
   "author": "Pods Foundation, Inc",
   "homepage": "https://pods.io/",
diff --git a/readme.txt b/readme.txt
index 6ebbf16180..001494be8e 100644
--- a/readme.txt
+++ b/readme.txt
@@ -5,7 +5,7 @@ Tags: pods, custom post types, custom taxonomies, content types, custom fields,
 Requires at least: 6.0
 Tested up to: 6.3
 Requires PHP: 7.2
-Stable tag: 3.0.6
+Stable tag: 3.0.7
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -177,6 +177,12 @@ Pods really wouldn't be where it is without all the contributions from our [dono
 
 == Changelog ==
 
+= 3.0.7 - October 19th, 2023 =
+
+* Fixed: Avoid duplicate fields showing up when registering fields manually through `pods_group_add()` instead of through normal DB or file-based configs. #6317 (@sc0ttkclark)
+* Fixed: Resolve cases where Settings pod types would treat every save as a new item. (@sc0ttkclark) 
+* Fixed: Swept through the codebase to fix all remaining return type issues with PHP 8+ for the most common extended/implemented methods. (@sc0ttkclark)
+
 = 3.0.6 - October 2nd, 2023 =
 
 * Fixed: Resolved a plugin conflict with The Events Calendar / Event Tickets plugins that was introduced in 3.0.5. (@sc0ttkclark)
diff --git a/src/Pods/API/Whatsit/Value_Field.php b/src/Pods/API/Whatsit/Value_Field.php
index 8b77a04f37..ad53fff933 100644
--- a/src/Pods/API/Whatsit/Value_Field.php
+++ b/src/Pods/API/Whatsit/Value_Field.php
@@ -56,8 +56,7 @@ public static function init( Whatsit $field ) {
 	 *
 	 * @uses Whatsit::__toString()
 	 */
-	#[\ReturnTypeWillChange]
-	public function __toString() {
+	public function __toString(): string {
 		return $this->_field->get_identifier();
 	}
 
@@ -68,8 +67,7 @@ public function __toString() {
 	 *
 	 * @return bool Whether the offset exists.
 	 */
-	#[\ReturnTypeWillChange]
-	public function offsetExists( $offset ) {
+	public function offsetExists( $offset ): bool {
 		return $this->__isset( $offset );
 	}
 
@@ -94,7 +92,7 @@ public function &offsetGet( $offset ) {
 	 * @param mixed $offset Offset name.
 	 * @param mixed $value  Offset value.
 	 */
-	public function offsetSet( $offset, $value ) {
+	public function offsetSet( $offset, $value ): void {
 		if ( null === $offset ) {
 			// Do not allow $object[] additions.
 			return;
@@ -108,92 +106,91 @@ public function offsetSet( $offset, $value ) {
 	 *
 	 * @param mixed $offset Offset name.
 	 */
-	public function offsetUnset( $offset ) {
+	public function offsetUnset( $offset ): void {
 		$this->__unset( $offset );
 	}
 
 	/**
 	 * Check if offset exists.
 	 *
-	 * @param mixed $offset Offset name.
+	 * @param mixed $name Offset name.
 	 *
 	 * @return bool Whether the offset exists.
 	 *
 	 * @uses Whatsit::__isset()
 	 */
-	#[\ReturnTypeWillChange]
-	public function __isset( $offset ) {
-		if ( 'value' === $offset ) {
+	public function __isset( $name ): bool {
+		if ( 'value' === $name ) {
 			return isset( $this->_value );
 		}
 
-		return $this->_field->__isset( $offset );
+		return $this->_field->__isset( $name );
 	}
 
 	/**
 	 * Get offset value.
 	 *
-	 * @param mixed $offset Offset name.
+	 * @param mixed $name Offset name.
 	 *
 	 * @return mixed|null Offset value, or null if not set.
 	 *
 	 * @uses Whatsit::__get()
 	 */
 	#[\ReturnTypeWillChange]
-	public function __get( $offset ) {
-		if ( 'value' === $offset ) {
+	public function __get( $name ) {
+		if ( 'value' === $name ) {
 			return $this->_value;
 		}
 
-		return $this->_field->__get( $offset );
+		return $this->_field->__get( $name );
 	}
 
 	/**
 	 * Set offset value.
 	 *
-	 * @param mixed $offset Offset name.
+	 * @param mixed $name Offset name.
 	 * @param mixed $value  Offset value.
 	 *
 	 * @uses Whatsit::__set()
 	 */
-	public function __set( $offset, $value ) {
-		if ( 'value' === $offset ) {
+	public function __set( $name, $value ): void {
+		if ( 'value' === $name ) {
 			$this->_value = $value;
 
 			return;
 		}
 
-		$this->_field->__set( $offset, $value );
+		$this->_field->__set( $name, $value );
 	}
 
 	/**
 	 * Unset offset value.
 	 *
-	 * @param mixed $offset Offset name.
+	 * @param mixed $name Offset name.
 	 *
 	 * @uses Whatsit::__unset()
 	 */
-	public function __unset( $offset ) {
-		if ( 'value' === $offset ) {
+	public function __unset( $name ): void {
+		if ( 'value' === $name ) {
 			$this->_value = null;
 
 			return;
 		}
 
-		$this->_field->__unset( $offset );
+		$this->_field->__unset( $name );
 	}
 
 	/**
 	 * Call a method on the field.
 	 *
-	 * @param string $method    The method name.
+	 * @param string $name      The method name.
 	 * @param array  $arguments List of arguments.
 	 *
 	 * @return mixed The method response.
 	 */
 	#[\ReturnTypeWillChange]
-	public function __call( $method, $arguments ) {
-		return call_user_func_array( [ $this->_field, $method ], $arguments );
+	public function __call( $name, $arguments ) {
+		return call_user_func_array( [ $this->_field, $name ], $arguments );
 	}
 
 	/**
diff --git a/src/Pods/Container/Container_DI52.php b/src/Pods/Container/Container_DI52.php
index 7bd661d82f..8f6f9f40e3 100644
--- a/src/Pods/Container/Container_DI52.php
+++ b/src/Pods/Container/Container_DI52.php
@@ -87,7 +87,8 @@ public function singleton( string $id, $implementation = null, array $afterBuild
 	/**
 	 * Defer all other calls to the container object.
 	 */
-	public function __call( $name, $args ) {
-		return $this->container->{$name}( ...$args );
+	#[\ReturnTypeWillChange]
+	public function __call( $name, $arguments ) {
+		return $this->container->{$name}( ...$arguments );
 	}
 }
diff --git a/src/Pods/REST/V1/Validator/Base.php b/src/Pods/REST/V1/Validator/Base.php
index acd25b3085..b918a080a4 100644
--- a/src/Pods/REST/V1/Validator/Base.php
+++ b/src/Pods/REST/V1/Validator/Base.php
@@ -182,6 +182,7 @@ public function is_json( $value ) {
 	 *
 	 * @return mixed The method return response.
 	 */
+	#[\ReturnTypeWillChange]
 	public function __call( $name, array $arguments ) {
 		$mapped = [
 			'is_pod_item_id_valid_for_pod_'         => 'is_pod_item_id_valid',
diff --git a/src/Pods/Whatsit.php b/src/Pods/Whatsit.php
index d890690ec3..d85b225d88 100644
--- a/src/Pods/Whatsit.php
+++ b/src/Pods/Whatsit.php
@@ -234,7 +234,7 @@ public static function from_array( array $array, $to_args = false ) {
 	 *
 	 * @return array Data for debugging with.
 	 */
-	public function __debugInfo() {
+	public function __debugInfo(): array {
 		return [
 			'args' => $this->args,
 		];
@@ -245,6 +245,7 @@ public function __debugInfo() {
 	 *
 	 * @return self Object with state set.
 	 */
+	#[\ReturnTypeWillChange]
 	public static function __set_state( $data ) {
 		$args = [];
 
@@ -260,7 +261,7 @@ public static function __set_state( $data ) {
 	 *
 	 * @return array List of properties to serialize.
 	 */
-	public function __sleep() {
+	public function __sleep(): array {
 		// @todo If DB based config, return only name, id, parent, group
 		// @todo Maybe set up a variable with the custom array and implement Serializable::serialize/unserialize
 		/*
@@ -286,7 +287,7 @@ public function __sleep() {
 	/**
 	 * On unserialization of this object, setup the object.
 	 */
-	public function __wakeup() {
+	public function __wakeup(): void {
 		// Setup the object.
 		$this->setup();
 	}
@@ -311,7 +312,7 @@ public function jsonSerialize() {
 	/**
 	 * {@inheritdoc}
 	 */
-	public function getArrayCopy() {
+	public function getArrayCopy(): array {
 		return array_values( $this->args );
 	}
 
@@ -361,8 +362,7 @@ public function valid(): bool {
 	 *
 	 * @return string Object identifier.
 	 */
-	#[\ReturnTypeWillChange]
-	public function __toString() {
+	public function __toString(): string {
 		return $this->get_identifier();
 	}
 
@@ -373,7 +373,6 @@ public function __toString() {
 	 *
 	 * @return bool Whether the offset exists.
 	 */
-	#[\ReturnTypeWillChange]
 	public function offsetExists( $offset ): bool {
 		return $this->__isset( $offset );
 	}
@@ -420,16 +419,15 @@ public function offsetUnset( $offset ): void {
 	/**
 	 * Check if offset exists.
 	 *
-	 * @param mixed $offset Offset name.
+	 * @param mixed $name Offset name.
 	 *
 	 * @return bool Whether the offset exists.
 	 */
-	#[\ReturnTypeWillChange]
-	public function __isset( $offset ) {
-		if ( is_int( $offset ) ) {
+	public function __isset( $name ): bool {
+		if ( is_int( $name ) ) {
 			$args = $this->getArrayCopy();
 
-			return isset( $args[ $offset ] );
+			return isset( $args[ $name ] );
 		}
 
 		$special_args = [
@@ -440,11 +438,11 @@ public function __isset( $offset ) {
 			'options'       => 'get_args',
 		];
 
-		if ( isset( $special_args[ $offset ] ) ) {
+		if ( isset( $special_args[ $name ] ) ) {
 			return true;
 		}
 
-		$value = $this->get_arg( $offset, null );
+		$value = $this->get_arg( $name, null );
 
 		return ( null !== $value );
 	}
@@ -452,38 +450,38 @@ public function __isset( $offset ) {
 	/**
 	 * Get offset value.
 	 *
-	 * @param mixed $offset Offset name.
+	 * @param mixed $name Offset name.
 	 *
 	 * @return mixed|null Offset value, or null if not set.
 	 */
 	#[\ReturnTypeWillChange]
-	public function __get( $offset ) {
-		if ( is_int( $offset ) ) {
+	public function __get( $name ) {
+		if ( is_int( $name ) ) {
 			$args = $this->getArrayCopy();
 
-			return isset( $args[ $offset ] );
+			return isset( $args[ $name ] );
 		}
 
-		return $this->get_arg( $offset );
+		return $this->get_arg( $name );
 	}
 
 	/**
 	 * Set offset value.
 	 *
-	 * @param mixed $offset Offset name.
+	 * @param mixed $name Offset name.
 	 * @param mixed $value  Offset value.
 	 */
-	public function __set( $offset, $value ) {
-		$this->set_arg( $offset, $value );
+	public function __set( $name, $value ): void {
+		$this->set_arg( $name, $value );
 	}
 
 	/**
 	 * Unset offset value.
 	 *
-	 * @param mixed $offset Offset name.
+	 * @param mixed $name Offset name.
 	 */
-	public function __unset( $offset ) {
-		$this->set_arg( $offset, null );
+	public function __unset( $name ): void {
+		$this->set_arg( $name, null );
 	}
 
 	/**
@@ -1810,6 +1808,7 @@ protected function get_export_for_items( array $items, array $args = [] ) {
 	 *
 	 * @return mixed|null
 	 */
+	#[\ReturnTypeWillChange]
 	public function __call( $name, $arguments ) {
 		$object = null;
 		$method = null;