Removed more comments that didn't make much sense.

Made the presence/absence of a semicolon after macros consistent.