Remove some FIXMEs that have been dealt with.