Refactored JavadocEscaper