Sigh.. re-export things I don't want to export, for now