This adds to the ongoing effort to remove all pointers to structs in the configuration without breaking backwards compatibility.