Updated: switch to int64 for all lengths

Conflict-free version of #170