Minor comment fixes
Reduce code repetition by using higher-order macros