Revert "copy/pastes syntactic class and trait defs from master to fix a bug"

This reverts commit 214d0a58c8d3ee117d4597ef7dee637d761d8640.