Reorder engine arguments to be more natural