Using one token look-ahead works much better