Bug 938723 - Lots of good improvements in response to code reviews