General code quality fixes #1236

Job	Run time
clickable (Debug, amd64, glew)	11m 0s
clickable (Debug, amd64, sdl)	10m 5s
clickable (Debug, armhf, glew)	11m 1s
clickable (Debug, armhf, sdl)	9m 37s
clickable (Release, amd64, glew)	10m 42s
clickable (Release, amd64, sdl)	10m 44s
clickable (Release, arm64, glew)	10m 49s
clickable (Release, arm64, sdl)	12m 20s
clickable (Release, armhf, glew)	9m 37s
clickable (Release, armhf, sdl)	8m 58s
	1h 44m 53s

Provide feedback