Properly handle shift within identifier parse.