Module reexports, fixing #8407.