CSPACE-5988: Some code cleanup.