Replaced all N_MAKE_UN with N_MAKE_NODE and N_ADD_CHILD macros