Tweaks to revert StringBuilder to simple.