reinstate strongly typed fields now that rebind issue is fixed, and minor tidies elsewhere