Minor tidy-up stuff.