Further parser code simplication using XPath.