Fix some &String
, &Option
, and &Vec
usages
#1670
Merged
&String
, &Option
, and &Vec
usages
#1670