Simplify adding modules somewhat.