Bug 958889 - Review comment: Part 6 comments.