Improvements to IRF script.