More IRState reductions.
Remove dead code from driver.