NodeList container repairs

- a barrage of attempted fixes for #1567