Continue BatchLexer improvements