Indeed, in general eddy's cleanups touch lots of code I've touched so it's certain we'll have conflicts.