Structural tidy-up.