Make it easier to widen branch counts.

All regression tests pass.
Full sanity checks for counter types.

All regression tests pass.
Remove unneeded header.