CSPACE-6278: More parameterization.