Working on primtive collection support; currently the generator is broken; work in progress.