simplify handling of x_var and y_var
allow arbitrary axis names