Minor performance adjustments.