Removed some FIXMEs.