Yeah I agree. I'll probably send this PR again soon in a new incarnation. It simplifies things and removes noise.