Modularize more steps in the strings strategy (#3676)