Sorted fields and minor tidy-ups.