Address comments on the first patch of bug 330707

https://bugzilla.mozilla.org/show_bug.cgi?id=330707#c32