Merge "Fix uses of KeyedVector"