Minor performance enhancements.