Adapt to NodeList without ArrayAccess
#2314
+4
−4
Draft