More refactoring #3041

Job	Run time
ubuntu-clang-deprecated Debug	21m 38s
ubuntu-clang-deprecated Release	23m 3s
ubuntu-clang-quaternions Debug	21m 49s
ubuntu-clang-quaternions Release	23m 53s
ubuntu-clang-tbb Debug	23m 38s
ubuntu-clang-tbb Release	24m 47s
ubuntu-clang-cayleymap Debug	21m 59s
ubuntu-clang-cayleymap Release	22m 42s
ubuntu-clang-system-libs Debug	21m 38s
ubuntu-clang-system-libs Release	22m 37s
ubuntu-no-boost Debug	21m 36s
ubuntu-no-boost Release	22m 55s
ubuntu-no-unstable Debug	17m 41s
ubuntu-no-unstable Release	18m 53s
	5h 8m 49s

Provide feedback