Stop using [] syntax in types
Merge branch 'list'