Various cleanups around "const" #1352

Job	Run time
ubuntu-test-install (middle_schema)	3m 51s
ubuntu-test-install (public)	3m 44s
	7m 35s

Provide feedback