Fix a FIXME.
Fix another FIXME.