Add SafeString so we don't need to triple-stash anymore