fix regressions due to new IProblem/irritant token.
2 files changed