Test fix for #34; fix warnings around th-desugar reorg.