tex: Style Estimator cleanup II