Finish up work on composite types