Improve removal of CompilerGenerated nodes