On your first question, it may be a little early to predict precisely what will be in a treaty, but there was much discussion in Oslo about the need for this to be a comprehensive treaty that has an integrated approach and will, like the Mine Ban Treaty, deal with clearance issues, responsibility for clearance, transparency, and victim assistance. So I feel certain that the problem you're pointing to will be addressed in some fashion in a new treaty.
The other encouraging thing about Oslo, in addition to the fact that so many countries came and committed to a deadline for a new treaty, was that a process was also agreed to that will serve as negotiating sessions leading to the treaty. The first of those will occur in Lima, Peru, in May. Then there will be follow-on sessions in Austria, likely New Zealand, as well as Ireland.
Canada needs to get out front at the early stages of this, so the next key date by which they need to have moved their policy even further along--hopefully in a major leap forward--will be the meeting in Lima, Peru. So there's a timeframe established here.