WIP: Restore binary compatibility of MapIterObject (hopefully)