Various tidy-ups.