Cleanup EjectOnDeath and nudge pilots

as in #4005.