Fix up (re-)exports, such that haddock is happy too