Fix simplified engine setup.

Sorry about that. It should work now and it's still cleaner than before and more extensible even. Let me know what you think.