yes, sir :)
I will isolate = make a separate PR. But for now the focus should be on the architecture. I imagine there will be more of these unrelated fixes coming up, and I don't want to waste time with that right now.