More massaging of Node into the proper form