Lexeme display refactoring continued