Made string parameters less copy-happy