Only cleric-test depends on flexi-streams now.