That sounds like a good suggestion.
With respect to adopted kids, if I go to China and adopt a child there, and that child comes over as a Canadian citizen, then that child's grandkids, if they're born outside Canada, would not be Canadian. But if I adopt that kid and the kid comes to Canada as a landed immigrant, then that kid would be okay for a second generation. There's no second-generation cut-off. So in my book, an adopted kid should be treated the same way as a Canadian-born kid, because the parents treat them the same way.
This is an area that is not covered by your bill. If we were to go into it, would you object?