Rearranged a bit. Use the new macro in valuenode.h introduced in the previous commit...