This is just much simpler going forward, and a lot less "magic"
happening. Just put the autogenerated code in its own module, instead of
the main one via trickery.