SyntacticClassDef and SyntacticTraitDef used, code cleanup