Add expr builtin and sort builtins lexically