Yeah, I agree. Once this is merged I'm planning a PR to rework that and make it clearer, but it was beyond the scope of this one.