1.0.30.2: more aggressive constant-folding