Fix triangle.x in demo.
Fix a bunch of cell.foo notation in demos.