Fixed some handle conversions for -DSTRICT.