Improve resolver by extensions to use mapped types for original CLR types.