Change cell.foo geometry notation.
Change dict comprehension to dict constructor.