Amortized stuff.
Merge branch 'amortized'