more fallout from recent work
simplify section on generic enumerated types