follow with_type when constructing map literals (closes #2960)