Update to match changes to StringUtil