Minor performance improvements.