TWiT - Xpath updates; make @indirect.