> What about the main point of the PR?

Sorry, I switched to #204 for that.