Store a vector of IndexedFields in both the s2 descriptor and
keygenerator so the s2 key generation code can work properly
Fix trivial bugs