[jhc] darcs patch: move selector creation from desugar to r... (and 1 more)