Expand template argument type deduction #20222

Job	Run time
build_cmake (ubuntu:24.04, true, true)	3m 22s
build_make (ubuntu:24.04)	3m 23s
build_make (ubuntu:25.10)	3m 43s
build_cmake (ubuntu:25.10, true, true)	3m 21s
build_make (alpine:3.23)	5m 52s
build_cmake (alpine:3.23, false, false)	4m 21s
	24m 2s

Provide feedback