Move some stuff up to the global namespace

My bad. Forgot this PR.