Went through structs with a finer-toothed comb.