Simplify return of Cell

4 jobs for !3363 with ahennequ_calocellid in 23 seconds
latest merge request