Move mark store from Buffer to Lexer