Tweaked how we deal with indexes in estimator. This will almost definitely break everything.