General code cleanup in magpie-common-exports