Merge "Fix raw references to SimpleNode"