remove all unnecessary manual instance additions

and adjust tests accordingly

some test data was actually changed because instances were being added
over-eagerly
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