CFG edit

I edited the CFG to fix some problems. This added several S/F conflicts,
but from what I can see, they are all always shift problems.  Further
testing needed