WORDS-134 - use document type as class or enum, but not as String - minor changes.