Fix expansion of map update arguments

@josevalim