Correct a few more misleading assert orders.