More util reference cleanup.