types::String usage is gone (except one place)