minor cleanups triggered by researching Eigen issue