Some more tidy ups.