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

Good point.  Inititally, didn't want to depend on order here.  But I should take advantage of it.