Fix a number of legacy screw-ups on arguments order.