Cleanup some param list orderings