conditionalize same_op_no_op and change add/inc functions to be consistent with its use