Yeah.  I spotted another issue as well.  Doesn't look like I updated this PR after making the changes to first CC PR.

Give me a few minutes to bring this back up, review, and test.  Sorry about this.  I just didn't think to update this after making the other changes.