Make other plotting functions map-friendly by avoiding kwargs.pop