Got rid of forced rid2ro removals on random things, and instead tracking the calcrt flag at start of :run.