I'll revert because, although I was being fairly careful, there is one place where a conflict needs fixing, will ping when done.