Add type field to expr variants.