Bug 963442 - Review comments.