Update to simpler module generation.