Bug 1092998 - Followup to address review comments. r=keeler