Simplify scan-error a bit.
Use COND in FETCH-NEXT-TOKEN