Remove the remaining races, new and old.

Also, resolve a few other TODOs.

Change-Id: Icb39b5a5e8ca22ebcb48771cd8951c5d9e112691
Reduce lock-protected area during scrape.

Change-Id: Iaa7faa7c916b1890b568d05bd8bfff6299b6767d
Merge branch 'master' into bjoern/deal-with-complicated-todos

Conflicts:
	README.md

Change-Id: Ia9cf8c3498ec6238669f52b4114f3db54dd0bd07
Merge pull request #416 from prometheus/bjoern/deal-with-complicated-todos

Remove the remaining races, new and old.