That approach was going to break stuff. Defining a named module is better.
Merge branch 'amd'