Fix problems with GHC's Typed Holes
Merge branch 'fix-typed-holes'