Bye to __non_recur_add() and __recur_add()