refactor UnitAnnotator to use typeSystemInit