Cleaned up some of the glob handling.