If that explanation is too complicated, I can easily split the unclear change off into an extra PR for further discussion and just leave the other changes here :)