Some more small speed related tweaks.