Merge "Move string analysis to its own file"