I'll try to respond to that as quickly as I can in the time remaining.
When I first introduced this as Bill C-576, it was just there as “peace officer”, but because “public officer” specifically refers to Royal Canadian Mounted Police, we expanded it. We had discussions with the drafters when I was going back over this. They felt that was probably the best and most inclusive way. Just to remind you, there were many different entities involved, such as customs and excise, immigration, corrections, fisheries, and Canadian Forces pilots in command of aircraft. No doubt you've seen others: wardens, reeves, sheriffs, justices of the peace, and police officers. This was the rationale for putting the two of them together. This way police officers were in both sides of the definition as it was in section 130, but I do recognize what you're suggesting about other specific ones.
I still think that by stating what this is, the courts would also then look at this as something that is relevant if that was the rationale or the trigger that was used in order to commit another offence.