A bit more cleanup for recurr.py