Fix gen-expr-info