Shorten geometry code

Should gain about 3 pages this way
Remove bafflement

Superceded by stairway anyway
Compress maxflow code a bit