Add next tokens to parser, close #3