Overhauled node list building.