More changes to builtin, method and syntax.