Fix a few nits with save-analysis

r?