Bug fixes and compiler macros for comparison functions.