Ongoing reorganization of IRF validation code.