Reorganize ExpectSyntax