Move some things to the toplevel