bl1 / v2.0 fixups #155

Job	Run time
build-ubuntu (llvm-mingw-oak-release, llvm-mingw)	1m 32s
build-windows (msvc-oak-release)	1m 29s
build-ubuntu (clang-cross-willow-release, clang-cross)	3m 25s
build-ubuntu (clang-cross-oak-release, clang-cross)	2m 57s
build-windows (clang-willow-release)	3m 14s
build-windows (msvc-willow-release)	1m 43s
build-windows (clang-oak-release)	3m 3s
build-ubuntu (llvm-mingw-willow-release, llvm-mingw)	1m 38s
build-ubuntu (mingw-willow-release, mingw)	1m 56s
clang-tidy (clang-oak-release)	11m 37s
build-ubuntu (mingw-oak-release, mingw)	1m 56s
clang-tidy (clang-willow-release)	11m 38s
spelling	4s
clang-format	1m 42s
	47m 54s

Provide feedback