Bug 985702: Address review comments