PBC fix bundle #2037

Job	Run time
macos-latest: clang++ Release Threads	11m 47s
macos-latest: clang++ Release OneTBB	1m 2s
macos-latest: clang++ Release PaRSEC	1m 13s
ubuntu-20.04: /usr/bin/g++-9 Release Threads	36m 14s
ubuntu-20.04: /usr/bin/g++-9 Release OneTBB	1m 51s
ubuntu-20.04: /usr/bin/g++-9 Release PaRSEC	1m 6s
macos-latest: clang++ Debug Threads	17m 40s
macos-latest: clang++ Debug OneTBB	1m 27s
macos-latest: clang++ Debug PaRSEC	1m 30s
ubuntu-20.04: /usr/bin/g++-9 Debug Threads	49m 1s
ubuntu-20.04: /usr/bin/g++-9 Debug OneTBB	1m 39s
ubuntu-20.04: /usr/bin/g++-9 Debug PaRSEC	1m 46s
	2h 6m 16s

Provide feedback