Move stuff to the base library.