Thanks for catching the typo in my point #1, Dick.  Obviously the first one is Khadr.

Your first point about the Chretien and Martin governments is accurate, which is why I've always included it where relevant.  As it actually happened, of course, the Harper government only made it worse.