Integrate a variant of Siu's patch for OS X & pycc. Also, get rid of EngineBuilder.