:articulated_lorry: cleanup, add cohort field