review feedback: use `Self` rather than `self` in comments where appropriate.
Removed unused `EnumNonMatchFunc` type def.

Drive-by: revise `EnumNonMatchCollapsedFunc` doc.
More comment updates from review feedback.
Switch from a tuple of variant index values to directly referencing
identifiers bound to each Self arguement's respective values.