Make rsr a little better again, here come the huge lazy commits.