I understand the reasoning, but prolly need to apply it through the entire lib to get the benefit of removing the dependency, if that's the directing we want to go.