Additional minor tweaks to get StringIO closer to 100%.