Eng6884 review2

Don't merge, I'll squash it later.
I just added a pointer back to VoltXMLElement instead.