Tidy up in distribute_cell_layer()