Fix some struct/class specifier mismatches.