This last patch looks good to me.
Can we merge it?