Minor fixes - PHP style tags and apostrophes on XPath parameters.