Changed computatation for shape.

Shape can sometimes be 3D, and the tuple upacking expected only
2 dimensions, causing an exception in those cases.
Added note of functionality moving away.