The national security watchdog argues laws that allow convicted terrorists to be held in prison after their sentence is over should be dumped.