A bit of cleanup of Rice.