Move some stuff to the `util` namespace.