Some OISC RP refactoring