Minor performance improvments.