Tidied up some field definitions.