offer additional methods that take analyzer + text instead of tokenstream; fix some unused imports and variables