Cleanups as prelude to Utils API

Constrains usage of Util functions to reduce surface of API.