Making some minor performance improvements.