Some tidy-up.