Simplify moduleToCComp even more.
Merge pull request #149 from pjonsson/misc-fixes

Simplify moduleToCComp even more.