Eliminate more raw types.