Simplify X-ray attacks form
Implementation of Marco.
No functional change.