Removed more Java Collections usages in the compiler