Replacing DefineState with DefineSyntax.
Replacing DefineState with DefineSyntax.
Simplified handling of builtin, method and syntax.