Use positional arguments for shapes instead of named args.

Also we use "point" tuples when points are involved.