move from macros to gen_comparisons