Minor code quality improvements.