There are still a couple subtle differences in how we track and
store the various module attributes.  For example, we show something
different for 'print ModuleType("a", "b")'.

Also sneak in a fix for "import a.b.c as c"