Merge branch 'gary/reredo-test-operand-order'

The original manually applied changeset 962aa91 contained several
errors (some corrected by subsequent patches on master, others not)
and many unrelated (although in this case, correct) changes were also
committed in the same changeset.

The merged branch gary/reredo-test-operand-order factors the
unrelated changes out into separate commits, and performs the work
that should have been in 962aa91 with a script, the results of which
were then painstakingly inspected for errors.

This merge moves the corrections for errors made in the original
manual patch from the branch onto master.  Please inspect the many
separate changesets on the branch rather than the original patch
when you bisect or otherwise find your way to an error caused by
962aa91.