More of this is coming. I have another PR which replaces all the locally held RP type state with references to RpInfo, but it makes the PR blow up so I'll issue it once we get this PR merged.