Minor clean up
Migrate ZincCompiler