A further tidy-up of the output.