Move some util functions into the util section.