I'm not sure if it needs to be upgraded or changed in the Criminal Code so much, but I would agree that there does seem to be a need for some clarification to help the police officer on the street make the proper decision and understand the prosecution's side of it, whether that's a change to the code for reference or better training and communication with police and prosecutions.
On October 23rd, 2018. See this statement in context.