core: continuing perf tweaks, per #8