Reworked parsing of location path. The original code was unmaintainable, especially with respect to (future) implementation of non-abbreviated XPath syntax.