Export list for 'Types' and further clean up.