Revised zero-variant enum handling (again).