more function collapse adjustments prior to trying to proper refactoring (nw)