Merge "Fix loophole in module expansion."