Move util stuff to another module.