Make the #defines for ADD_VALUENODE and ADD_VALUENODE2 more readable.