Hard to know what's new and what's not in this diff. :/