Merge "Fix non-generic references to NormalizedNode"