Moved answer discarding to its own annotator.