Reordering arguments.

[Andy Seaborne]

Adam,

I had a go at mapping arguments, all driven by one single TupleMap.

https://gist.github.com/afs/73f3b118726f1625cb33

        Andy