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

I like it.  Phases came after this in code writing order :)