Improved, re:  Regarding: https://bugzilla.mozilla.org/show_bug.cgi?id=1092375

will simplify.  The doesn't get used.  Not quite ready to throw it out, but will note it.