Bug 939534 - Follow-up to address review comments. r=heycam