CMP constants were moved