Minor performance tweaks.