Some more small speed tweaks.