Bug 1094545 followup: only do system stuff for non-worker descriptors, and rename one consumer that was colliding with the new URL global.  r=bholley pending, but checking in now to fix CLOSED TREE