Desugar declarations.
Fix incorrect desugar.
Desugar initialisations.
Merge branch 'master' into style-checking