Revised first and follow sets