Double checked and you are indeed correct. I'm cool with exporting these at the top level then.