One more round of refactoring -- removed a slim lib that only clutters the codebase as an extra helper (i.e.,  doesn't add value or any obfuscation of any sort)...