Fix invalid struct tags and remove unreachable code.