A fine plan! Did this in b2f846d.