JAL-1767 minor field tidying prior to functional changes