There are a lot of FIXME's and TODO's scattered through the repository. Some are very old, this removes two and fixes one.