No longer much template parameters in paths

to put the / path delim inside the curlies.
Just leave them as-is.

Change-Id: Id3e4e0e2b81a5281c2f812b5c59dab78dfdce5b9