What work do you have queued up to go in here @apoelstra. Do you want me to hold off doing trivial-ish patches so you don't have to rebase?