I agree. It's like this today because some callsites needed. My plan is to pass dependency around. (I mention some of this on the commit messages, maybe about other object).