Structural refactors.