Yes, this would be a good change. You've tested it, yes?
IIRC there was no way to do this back in the day when this code was first written for later versions of ACS 3.x, and that's why the RP hack was developed.
It will not only simplify but slightly speed up the RP, too.