create some further generic blood analyte types, and move various existing analyte archetypes under them. Fix a few missed specialisations from previous round by Patrick.