More ironfoundry TODOs