Fix move with Map argument and promotion bug