Cleared confusion in constants limiting number of location paths per expression.
Moved code to retrieve template parameter names to a separate function for easier reuse.
Merge branch 'master' into xslt