Beyond Discrepancy: A Closer Look at the Theory of Distribution Shift