Refactored Corr, Expr, VecParser.