Cleanup: remove many un-necessary #define 1 statements
Cleanup: remove many un-necessary “1”’s in “#define *_HH” declarations