Fixes some regressions with structs/unions.