A handful of performance tweaks

@mmun @stefanpenner @rwjblue