Cleanup FIXMEs (#3488)

Now the snapshot is done.