Agree. However, I have some more general feedback that we should discuss, that might make this feedback irrelevant. I'll comment on the PR as a whole.