Clean up and finalize optional_object_attributes fix

Co-authored-by: Nugine <[email protected]>

Author: Copilot