#1054 Drop old-style NLP syntax: deprecation tags
#1061 Towards a clean public api