Changed the way that 'exports' are handled.