Wrong abstraction

Also written: the wrong abstraction

A shared function that its callers have outgrown, kept alive with flag parameters. The fix is to inline it into its callers and share only what really is the same.