Apply relevant modifications from type-error branch.
Merging heuristics from different branches...
Fixed merging of vim modes from experimental and type-error.