Big cleanup.
Fix a FIXME.
Fix anogher fixme.