Bug 972070 - followup to address review comments previously missed. r=jedp