Don't let map introduce type variables.

Closes PR 13581.