I think the relevant question is the transitioning provisions for people already here on RPIM. Like Kitson says, the category is being eliminated, so therefore no provisions are needed in the new bill. So the only issue is what to do with those on legacy categories. They won't get thrown out, the question is what's their pathway forward?
And as far as that goes, it seems RPIM has been left without a rabbi.