More fixes for real use.
Adding C-style #define collection types.