patch(1): make some macros look boolean.
Similar to r306560, plus remove an unused macro.
Suggested by: jmallett