Nearly Finished

[billroper]

The latest Merge From Hell (TM) is almost done. I have one error left to sort out and then I'll have a clean compile. I'll need to test to make sure that things are working, but -- for the moment! -- I'll be happy to see that clean compile. :)