Minor code quality and performance improvements.