Make Univariate / Multivariate distinction fundamental