[Extensions] Cosmetics for EP crash handling

Tiny fixes for an after-merge review.