Switch to explicit map type for resolve

Based on @basarat's feedback