+1 to @gylaz, both his opinions in this PR and more generally.