some speed-ups (based on bench/basic1)