137 names refactor part ix

* state.annotator now takes a tag
* parseTag now takes a Tag, rejects nil tags.