Optimum merging -- more incremental changes

It's about 2/3rds merged now. One more day, and should be nearly complete with a few questionable changes I am reserving for discussion.