Ignore whitespace tokens when re-computing spans in save_analysis

r?