Better enum handling.