Minor refactoring
Fix tests from upstream th-desugar change. Fixes #24.