Merge branch 'enh-configurable-syntax-expr'