more simplification (bench=3859940)