recirculation: Some cosmetic fixes