Misc 2

I just put everything in one PR again, let me know if I should split this up or remove something.

With the re-exports the only `Internal` imports we've needed are ShowConstant related. Is it worth re-exporting those for now or will they be removed soon?