Partial revert of newlines in: "env parameter added to several function calls"