Clean up content-scope wrapping in getEventListeners
Fix recognition of getEventListener return values