@9rnsr I don't think #1887 can be fixed _that_ easily ;) But every re-factoring that makes this part of code more obvious is one step towards me doing the new implementation. So thanks again for doing this.