Removing FIXMEs by formal changes only.