Cleaned up all FIXME's.