Minor tidy-up.