Clean up scripts to match new parameter ordering.