emit @define with --define, clean up name handling
more dead code elimination