can we coalesce these two sections (:685-:721)? Right now with the removed return if somebody adds something at :721 it could be wrong.

as below

I'm not a fan of these case statements lacking break; even if we know this is a NORETURN statement. Can we not have break; here at least?

Though not in practice, but implicit down-conversion can happen when datamodel is LP64 (or maybe compiler/smatch warn to this).
Solution: type of count variable should be ficlInteger.

Indenting still wrong here?

RB won't let me see the actual change (seems like there's no way to show whitespace changes, "helpfully"), but thanks.