CellML Annotation view: improved detection of direct terms (closes #472).