Make patching and regenerating patches easier