Bring sanity to the code (collection-runtime-vs-collection-lang)