improve some error messages and tighten up some code in desugar