Some tidy-up; no functional changes.