GrahamA: some tidy-up, renames.