Cleanup whitespace in desugar
Consistent format of docstrings in resolve-scope
Use annotation instead of manual check in desugar-toplevel-types