Use X and Y, not two Y's, for rigid's sigma

This was a bona-fide bug that we caught with our bigger tests (not yet
merged).