Make argument order more consistent
Add deterministic_parsing env_var