[BUGFIX beta] Put SafeString in the right place.

Fixes #9961