We can get the geometry from the command line; it might be worth plumbing it through.