The only thing I would add is that it's also important in this context to think about the provincial regulatory regimes. Most of the provincial acts on trespass to property are conditioned and have geographical limitations. One of the reasons why David Chen's arrest wasn't authorized under the Trespass to Property Act was that he was off the property. He was left to justify his arrest under the citizen's arrest provisions of the code, rather than the Trespass to Property Act.
You might want to look at some of the provincial analogues to see how these geographic restrictions are structured. There are certain geographic restrictions in the existing code provisions as well.