Minor tidy-ups.