Better writing of some xpath added in previous commits about XSLT optimization.

2018-02-19, Edouard Tisserant