Change a few things in CBash.h so API users don't get Collection.h included