Rework eval and load to use emit-classes