Minor structural refactors.