C++11 cleanup + simple XPath handling