r1202: This hopefully fixes our memory use when unmarshalling strings. The test case