Minor performance tweaking.