The really annoying merge continues. Over the last day and a half, I have managed to reduce the number of errors in the compile from over 1000 to under 300. I've also eliminated a bunch of code bits that are no longer required.
These are the good things.
The bad thing is that I found a couple of cases where someone is working with a shared buffer and I'm not confident that the shared buffer is being correctly locked. *sigh* It looks like it may be ok, but it makes me very nervous.