A couple improvements to the new arg-globbing code: