Move more places to proper isolate aquiration.
make the collection cleanup work, fix SYMBOL/STRING