Added greaterThan/lessThan macros, made definitions inline