final classes for syntax

Finishing up the leftovers from #450, pending #513 acceptance.