modify macro scheme for merged ops
more comments in merged-ops.c
bug fix in NAN for merged math1
handle NaN for math1 better in merged ops