Update to simpler module generation.
Merge pull request #9 from rwjblue/update-canary-to-simplify

Update to simpler module generation.