Revert the changes in this file back to c-strings -- we'll look at this at a later date.