Minor tweaks to deprecation warnings from toolingApi.