Resolve template return type T when a class-string<T> parameter is narrowed to a constant class-string

Resolve template return type T when a class-string<T> parameter is narrowed to a constant class-string #16946