Further tidy-ups.