Clean out a few outdated FIXME items
Merge pull request #2103 from tianon/clean-out-fixme

Clean out a few outdated FIXME items