Annotator: various simplifications to the code.
Annotator: various simplifications to the code.

cellml/libcellml,nickerso/libcellml,nickerso/libcellml,cellml/libcellml,hsorby/libcellml,hsorby/libcellml,hsorby/libcellml,nickerso/libcellml,nickerso/libcellml,cellml/libcellml,hsorby/libcellml,cellml/libcellml