Readded -Wno-mismatched-tag. Please compile things to check that they work before committing.