More tidying for distrib.