Work on eliminating FIXMEs.