Simplify remaining internal exports
Simplify more exports I missed the first time around