Minor tidy-up, and a partially-working group editor.