Fix two icc warnings #188: enumerated type mixed with another type.