KGerring/xpath code health