Changed Syntax classes into traits

Seems more sensible