some fixes in the desugar merge, and the beginnings of correct method lookup in phase1