Add a few more conditioning variables to exit-triggered-analysis.