[jsr-314-open] Cleaning up the composite PDL