Minor efficiency adjustments.