Simplifications #557

Job	Run time
B2 msvc-14.2	7m 46s
CMake gcc-11 17 Debug	7m 26s
B2 msvc-14.3	8m 33s
CMake msvc-14.2 Debug C++17	7m 5s
CMake gcc-11 20 Release	10m 9s
B2 gcc-11	4m 53s
CMake msvc-14.2 Release C++17	8m 33s
CMake clang-11 17 Debug	5m 57s
B2 clang-14	5m 45s
CMake msvc-14.3 Debug C++20	7m 28s
CMake clang-11 20 Debug	6m 25s
CMake msvc-14.3 Release C++20	6m 48s
CMake clang-13 17 Release	9m 14s
CMake clang-13 20 Release	9m 28s
CMake clang-14 17 Debug -stdlib=libc++	7m 20s
CMake clang-14 20 Release -stdlib=libc++	10m 45s
	2h 3m 35s

Provide feedback