Tidy up structured client specs some