The rest of the changes here look ok to me.