Handle concrete collection types properly

Fixes #938