Replaced compare functions with macros.
Picky about comments.