Various HardHook cleanups.