Some more tidy-ups