More IOC. Eliminated another TODO.