some more speedup experiments, that seem to shave off another second or two