Some more small reductions in IRState.