annotations: Changed collection groupby to produce maps
builtins: declare types we need for builtins in advance