Don't repeat function-expr in singular-path ABNF

[glyn]

Interesting. I thought I had already approved this somewhere else...

Yeah, I think I may have screwed up a rebase. Apologies.