Merge "Minor code clean-ups with no behavior change"