Bug 839271: Address review comments.