That's correct, although national security, as you'll know, Mr. Dubé, is not defined anywhere in the law, so the definition could be stretched or compacted, depending on the need.
Bill C-59 doesn't specifically indicate that CBSA, as one of the principal security and intelligence agencies, would necessarily fall under the systematic review of the new National Security and Intelligence Review Agency. The only agencies that are listed in part 1 of Bill C-59 are CSIS and CSE, and the rest is left to a broad mandate where CBSA and others might be reviewed, but not necessarily.