This will also clean up `OITResources` a bit.