More StringIO fixes.