Change to using variable length file handles, for better v3 support, and