Better handling of non-64x64 geometries..

The overall readability is not great unfortunately.