@kbjr, this can be removed now that you're parsing the expression, right?