revert faulty test changes
look for instances from within <stack> as well
make a special type XPathField for fields that contain xpaths

for a more declarative style, but it doesn't do anything functionally different