Vastly improve architecture but lose some features (eg. Sub-CAs).
Get support for Sub-CAs back and fix some cruft.