Small performance tweaks.