Recent commits to the comps have implemented the changes described here, so these FIXMEs can now be fixed.