Adapt to trunk (-safe-string).