Change Mut::map to Mut::with
Strip down Cell functionality