More module exports refactoring.