Move HID to new macros (which fixes the incorrect handle address as well).