Clean DiagRanges. Fix a possible problem introduced in r209468.