Pre-HID refactoring.