Bug 943728 - Apply forgotten review comment, and small fixup. r=me