Fix the span for discriminators in non-C-like enums

Fixes #17383.
Definitely! Done.