Bug 856361. Part 10: Address review comments.