Various, unordered changes...

The most important of which is, require 1.99.6.

Frankly, currently, the code is an outright mess.