app.nlp: Applying the DocumentAnnotator changes suggested in talks with Andrew