Retrospectively apply Potato's patches to the original source - these should be removed, have mutable function kwargs, etc.