Merge pull request #482 from nikomatsakis/debug-with-db-improvements

Merge pull request #482 from nikomatsakis/debug-with-db-improvements #444