I agree entirely.
I would say that in an ideal world, it would be a sort of auditor general who would work with analysts from various federal organizations, including the Canadian Security Intelligence Service, the Communications Security Establishment and Elections Canada. With the help of analysts from these various organizations, the person would, in my opinion, be able to do a better job of determining what information should be disclosed and how it should be disclosed.