Better X range checking

Refs #7860