Merge "Minor code cleanup to address warnings found by Clang."