factoring out storage (instead of treating it as a covering index)