I did it by hand. To simplify, I begin by temporarily commenting out the Operation CPVS declaration, so that all further references to its objects show up as errors and then track them one by one: Find one, jump to the corresponding object in the tree in MaciASL left panel, go to the next object to find the closing bracket, delete it, go back to the opening section and complete the deletion, check, rinse and repeat.
It's somewhat tedious, and not made easier by the many warnings produced when recompiling the base DSDT. (AMD ACPI tables are an awful mess compared with those from Intel systems.)
The new inner conditional statements are worse, as they can be quite long, which makes it difficult to find the closing bracket. But it's maybe not necessary to remove these.
Anyway, if the patches by @corpghost keep working these are a much, much, better way to go forward.