Better support for mapping to explicit interface implementation