Better X range checking

Refs #7860
Merge branch 'feature/7860_indirect_symmetrise' into develop