Remove whitespace change that crept in.
Attempt to make a now-outdated comment less misleading.
Alpha-rename `enum_nonmatch_g` back to `enum_nonmatch_f` to reduce overall diff noise.