I don't agree. Product.FindBaseProducts first does not handle initial stage at all and second does some additional fiddling with release notes. Not sure what would possibly break if I cleaned it up, the amount of stuff which is performed above is sufficient.