I would say that the subamendment really just focuses on retaining judicial discretion. The chapeau again says that you are limited because you must have set out grounds in your affidavit related only to (a) and (c). If you don't set out the grounds to (a) and (c), the judge will limit his order according to what you did set out.
Again, the tool is very narrow and limited. It can only be (a) to (c). The officer's going to need to set out the reasonable grounds to suspect the kind of information that they're looking for based on the facts they have before them, but the information related to the grounds will still need to be produced.