Tweak some comments per bug 910523 and bug 910517.

Taken from https://hg.mozilla.org/integration/fx-team/rev/c15febfd8b29