More performance tweaks for an additional 23% increase in speed.