More IRState clean-ups.