Improved enumaration cast.