Updated unsafeiter and unsafemapiter in DaCapo to use skip states