Fixup SchemaNodeIdentifier design