Merge pull request #1119 from rust-lang/more-tracking

More logging and a few attempts at fixes

Author: shepmaster