Update some FIXME tagged comments.