Merge "Always specify underlying enum type."