Better trait checker, works on multi classes per file (as in tests)