better expression support
fix static-eval version