Fix a thinko, winning one more test.
Toss an unused parameter.
Arg re-ordering to simplify stack handling.