Replace more pump'd code with variadic templates. PiperOrigin-RevId: 235584585
Attach a file by drag & drop or click to upload
