CSPACE-6299: Expanded one FIXME comment and added another.