Callisto: Remove assumption about max gap between files.

Closes #543