Merge "Minor cleanup in range analysis."