Various minor tidy-ups.