Simplify modules even more.