Minor performance tuning.