String substitution lint fixes