Fix map fast path one more time.