2 cosmetic and minor improvement patches #21281

Job	Run time
LP64-WIP	3m 58s
manifest-check	1m 5s
build-windows (ptl)	7m 32s
build-windows (imx8 imx8x imx8m imx8ulp)	10m 23s
build-windows (mtl lnl)	8m 52s
build-windows (tgl tgl-h)	9m 32s
build-windows (-d, lnl)	6m 51s
build-linux (mnfst, ptl)	4m 47s
build-linux (mnfst, tgl tgl-h)	5m 33s
build-linux (zmain, tgl tgl-h)	5m 30s
build-linux (mnfst, --all)	16m 29s
build-linux (mnfst, imx8 imx8x imx8m imx8ulp)	6m 43s
build-linux (mnfst, mtl lnl)	5m 48s
build-linux (-d, mnfst, lnl)	4m 41s
build-linux (zmain, imx8 imx8x imx8m imx8ulp)	6m 43s
build-linux (zmain, ptl)	4m 25s
build-linux (zmain, mtl lnl)	10m 14s
compare-linux-win	35s
	1h 59m 41s

Provide feedback