Part of #955: Move StringUtil to util package