Trivial performance improvements.