[WIP] Cleanup of covariance estimators.

Given our previous discussions, I've moved towards cleaning up some of the redundancy in our covariance code.