A couple more cleanups to the ioctl wrapper.