Clean-up of top-level node construction.