More glob-matching cleanups.