ditch: Small changes, shuffle some of the coe about.