Assorted structure fixes for 53.11 #823

Job	Run time
Process sizes (win64, old) / Build win64	3m 20s
Process sizes (win64, new) / Build win64	2m 10s
Process sizes (linux64, old) / Build linux64	55s
Process sizes (linux64, new) / Build linux64	1m 15s
ubuntu (64-bit)	10s
windows (64-bit)	39s
report	9s
	8m 38s

Provide feedback