Fix merge errors and apply review suggestions. #148

Job	Run time
Interpreter (Debug)	6m 49s
Free-Threaded (Debug)	10m 13s
i686-pc-windows-msvc/msvc (Debug)	16m 54s
i686-pc-windows-msvc/msvc (Release)	21m 10s
x86_64-pc-windows-msvc/msvc (Debug)	17m 48s
x86_64-pc-windows-msvc/msvc (Release)	20m 51s
aarch64-pc-windows-msvc/msvc (Debug)	5m 5s
aarch64-pc-windows-msvc/msvc (Release)	5m 58s
x86_64-apple-darwin/clang (Debug)	13m 18s
x86_64-apple-darwin/clang (Release)	14m 12s
aarch64-apple-darwin/clang (Debug)	9m 41s
aarch64-apple-darwin/clang (Release)	14m 42s
x86_64-unknown-linux-gnu/gcc (Debug)	7m 37s
x86_64-unknown-linux-gnu/gcc (Release)	17m 43s
x86_64-unknown-linux-gnu/clang (Debug)	7m 58s
x86_64-unknown-linux-gnu/clang (Release)	14m 15s
aarch64-unknown-linux-gnu/gcc (Debug)	1h 12m 23s
aarch64-unknown-linux-gnu/gcc (Release)	21m 50s
aarch64-unknown-linux-gnu/clang (Debug)	1h 3m 47s
aarch64-unknown-linux-gnu/clang (Release)	37m 9s
	6h 39m 23s

Provide feedback