Refinements to Unknown-node handling
Refinement to #113