yet more perf tweaks, per #8