The attached patch eliminates the many places where the rra_current pointer was maint...