Fix comment macros