Tidied up parameter ordering (fixed failing convention test).