Move things around in rcv.py.