Remove redundant local/upvar structs.