Removed old todo comment.
Fixed instances where collection types were improperly declared without subtype