Fix some build errors
Accomodate non-direct references to content without making the target a content node
Allow for early ending in parser