Fixing a performance regression when I added the scheduler
Performance upgrades.
More performance tweaking.