Expand template argument type deduction #20284

Job	Run time
build_make (alpine:3.23)	6m 3s
build_cmake (ubuntu:24.04, true, true)	5m 47s
build_make (ubuntu:25.10)	5m 11s
build_make (ubuntu:24.04)	4m 25s
build_cmake (ubuntu:25.10, true, true)	5m 43s
build_cmake (alpine:3.23, false, false)	4m 45s
	31m 54s

Provide feedback