Merge "Minor code simplification."