Fixup match_types
Merge branch 'master' of github.com:nikomatsakis/typing-haskell-in-rust