Minor performance changes.