Minor code quality changes.