Prep to encode non-integer metadata
Make enumerate work on version 1 again