[PD] turn abstractions into subpatches