Preparatory work for node-first approach.