Flatten module type expressions during module-preprocess
Merge pull request #398 from nicks/nick-modules2

Flatten module type expressions during module-preprocess