Restore genGenericBounds two places where it's needed to make the averager work.
There may be other cases where it's needed; we need to check that.