[jholzknecht]

The best guidance on this topic comes from A Guide to CRA Data Collection and Reporting, and it is a little vague when dealing with affiliated entities such as those described in your questions. I concur with your analysis in both situations.