1.0.25.32: improvements to WITHOUT-GCING