Improving TypesThat and ExportsThat