Export some more names off the top-level