More simplify X-ray attacks form
No functional change.