#624 resolves #624, `util` namespace cleanup.