(Apple) OSX HID - some cleanups