Fix some spaces not being correctly detected as top level #482

Job	Run time
build-windows	7m 16s
build-android-google-services	9m 24s
build-linux	4m 51s
build-android	9m 34s
build-web	3m 53s
	34m 58s

Provide feedback