Bug 947442 - Address review comments.