GitHub #177: Clean up Patch object re-create