More refactoring #3040

Job	Run time
ubuntu-clang-deprecated Debug	21m 16s
ubuntu-clang-deprecated Release	22m 54s
ubuntu-clang-quaternions Debug	22m 1s
ubuntu-clang-quaternions Release	23m 48s
ubuntu-clang-tbb Debug	23m 28s
ubuntu-clang-tbb Release	24m 48s
ubuntu-clang-cayleymap Debug	21m 36s
ubuntu-clang-cayleymap Release	22m 34s
ubuntu-clang-system-libs Debug	21m 32s
ubuntu-clang-system-libs Release	23m 13s
ubuntu-no-boost Debug	22m 17s
ubuntu-no-boost Release	22m 35s
ubuntu-no-unstable Debug	17m 45s
ubuntu-no-unstable Release	18m 30s
	5h 8m 17s

Provide feedback