Switch Untangle to using `long' rather than `int' in its internal