Some more small tweaks for speed.