NCWIP adjusting constructor call sites for EventListener to pass NULL for service worker