Move out of Util more code that is no longer shared.