No functional changes are expected. The goal here is to make further refactorings to the nodes system easier.